From 0026d5ff8259ce18bde1bebf3be938dce1ca2227 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Wed, 2 May 2012 16:46:13 +0900 Subject: run make -c mrblib from top --- tools/mruby/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/mruby/Makefile b/tools/mruby/Makefile index 956f2f709..7b7eb83be 100644 --- a/tools/mruby/Makefile +++ b/tools/mruby/Makefile @@ -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 $@ -- cgit v1.2.3