Commit 0026d5ff authored by Yukihiro Matsumoto's avatar Yukihiro Matsumoto

run make -c mrblib from top

parent af2ceeb5
...@@ -23,6 +23,7 @@ endif ...@@ -23,6 +23,7 @@ endif
.PHONY : all .PHONY : all
all : all :
@$(MAKE) -C src $(MAKE_FLAGS) @$(MAKE) -C src $(MAKE_FLAGS)
@$(MAKE) -C mrblib $(MAKE_FLAGS)
@$(MAKE) -C tools/mruby $(MAKE_FLAGS) @$(MAKE) -C tools/mruby $(MAKE_FLAGS)
# clean up # clean up
......
...@@ -12,10 +12,17 @@ RLIB := $(TARGET).rbtmp ...@@ -12,10 +12,17 @@ RLIB := $(TARGET).rbtmp
DEPLIB := $(TARGET).d DEPLIB := $(TARGET).d
MRB1 := $(BASEDIR)/*.rb MRB1 := $(BASEDIR)/*.rb
MRBS := $(MRB1) MRBS := $(MRB1)
LIB := ../lib/mruby
ifeq ($(OS),Windows_NT)
LIBR := $(LIB).lib
else
LIBR := $(LIB).a
endif
# C compiler (gcc) # C compiler (gcc)
CC = gcc CC = gcc
LL = gcc LL = gcc
AR = ar
DEBUG_MODE = 1 DEBUG_MODE = 1
ifeq ($(DEBUG_MODE),1) ifeq ($(DEBUG_MODE),1)
CFLAGS = -g CFLAGS = -g
...@@ -42,6 +49,7 @@ endif ...@@ -42,6 +49,7 @@ endif
.PHONY : all .PHONY : all
all : $(MRBC) $(MLIB) all : $(MRBC) $(MLIB)
$(AR) r $(LIBR) $(MLIB)
@echo "make: built targets of `pwd`" @echo "make: built targets of `pwd`"
# Compile mrblib source # Compile mrblib source
......
...@@ -19,10 +19,6 @@ OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mruby/*.c)) ...@@ -19,10 +19,6 @@ OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mruby/*.c))
#OBJ3 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/ext/enc/*.c)) #OBJ3 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/ext/enc/*.c))
OBJS := $(OBJ0) OBJS := $(OBJ0)
# mruby libraries
EXTC := $(BASEDIR)/../mrblib/mrblib.c
EXTRB := $(wildcard $(BASEDIR)/../mrblib/*.rb)
EXTM := $(patsubst %.c,%.o,$(EXTC))
# ext libraries # ext libraries
#EXT1 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../ext/socket/*.c)) #EXT1 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../ext/socket/*.c))
EXTS := $(EXT1) EXTS := $(EXT1)
...@@ -56,8 +52,8 @@ all : $(LIBR) $(EXE) ...@@ -56,8 +52,8 @@ all : $(LIBR) $(EXE)
@echo "make: built targets of `pwd`" @echo "make: built targets of `pwd`"
# executable constructed using linker from object files # executable constructed using linker from object files
$(EXE) : $(LIBR) $(OBJS) $(EXTM) $(EXTS) $(EXE) : $(LIBR) $(OBJS) $(EXTS)
$(LL) -o $@ $(CFLAGS) $(OBJS) $(EXTM) $(LIBR) $(EXTS) $(LIBS) $(LL) -o $@ $(CFLAGS) $(OBJS) $(LIBR) $(EXTS) $(LIBS)
-include $(OBJS:.o=.d) -include $(OBJS:.o=.d)
...@@ -70,10 +66,6 @@ $(LIBR) : ...@@ -70,10 +66,6 @@ $(LIBR) :
@$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS) @$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS)
# mruby library compile # mruby library compile
$(EXTM) : $(EXTRB) $(LIBR)
@$(MAKE) -C ../mrbc $(MAKE_FLAGS)
@$(MAKE) -C ../../mrblib $(MAKE_FLAGS)
# extend libraries complile # extend libraries complile
$(EXTS) : %.o : %.c $(EXTS) : %.o : %.c
$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@ $(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment