mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
run make -c mrblib from top
This commit is contained in:
@@ -23,6 +23,7 @@ endif
|
||||
.PHONY : all
|
||||
all :
|
||||
@$(MAKE) -C src $(MAKE_FLAGS)
|
||||
@$(MAKE) -C mrblib $(MAKE_FLAGS)
|
||||
@$(MAKE) -C tools/mruby $(MAKE_FLAGS)
|
||||
|
||||
# clean up
|
||||
|
||||
@@ -12,10 +12,17 @@ RLIB := $(TARGET).rbtmp
|
||||
DEPLIB := $(TARGET).d
|
||||
MRB1 := $(BASEDIR)/*.rb
|
||||
MRBS := $(MRB1)
|
||||
LIB := ../lib/mruby
|
||||
ifeq ($(OS),Windows_NT)
|
||||
LIBR := $(LIB).lib
|
||||
else
|
||||
LIBR := $(LIB).a
|
||||
endif
|
||||
|
||||
# C compiler (gcc)
|
||||
CC = gcc
|
||||
LL = gcc
|
||||
AR = ar
|
||||
DEBUG_MODE = 1
|
||||
ifeq ($(DEBUG_MODE),1)
|
||||
CFLAGS = -g
|
||||
@@ -42,6 +49,7 @@ endif
|
||||
|
||||
.PHONY : all
|
||||
all : $(MRBC) $(MLIB)
|
||||
$(AR) r $(LIBR) $(MLIB)
|
||||
@echo "make: built targets of `pwd`"
|
||||
|
||||
# Compile mrblib source
|
||||
|
||||
+2
-10
@@ -19,10 +19,6 @@ OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mruby/*.c))
|
||||
#OBJ3 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/ext/enc/*.c))
|
||||
OBJS := $(OBJ0)
|
||||
|
||||
# mruby libraries
|
||||
EXTC := $(BASEDIR)/../mrblib/mrblib.c
|
||||
EXTRB := $(wildcard $(BASEDIR)/../mrblib/*.rb)
|
||||
EXTM := $(patsubst %.c,%.o,$(EXTC))
|
||||
# ext libraries
|
||||
#EXT1 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../ext/socket/*.c))
|
||||
EXTS := $(EXT1)
|
||||
@@ -56,8 +52,8 @@ all : $(LIBR) $(EXE)
|
||||
@echo "make: built targets of `pwd`"
|
||||
|
||||
# executable constructed using linker from object files
|
||||
$(EXE) : $(LIBR) $(OBJS) $(EXTM) $(EXTS)
|
||||
$(LL) -o $@ $(CFLAGS) $(OBJS) $(EXTM) $(LIBR) $(EXTS) $(LIBS)
|
||||
$(EXE) : $(LIBR) $(OBJS) $(EXTS)
|
||||
$(LL) -o $@ $(CFLAGS) $(OBJS) $(LIBR) $(EXTS) $(LIBS)
|
||||
|
||||
-include $(OBJS:.o=.d)
|
||||
|
||||
@@ -70,10 +66,6 @@ $(LIBR) :
|
||||
@$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS)
|
||||
|
||||
# mruby library compile
|
||||
$(EXTM) : $(EXTRB) $(LIBR)
|
||||
@$(MAKE) -C ../mrbc $(MAKE_FLAGS)
|
||||
@$(MAKE) -C ../../mrblib $(MAKE_FLAGS)
|
||||
|
||||
# extend libraries complile
|
||||
$(EXTS) : %.o : %.c
|
||||
$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
|
||||
|
||||
Reference in New Issue
Block a user