diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-02 16:46:13 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-02 16:46:13 +0900 |
| commit | 0026d5ff8259ce18bde1bebf3be938dce1ca2227 (patch) | |
| tree | 4366a94ccb89cf9b949cdb37068bc2a07ca8c178 /tools | |
| parent | af2ceeb5bf535d0bd0c98f91f8fb99ada638d6a1 (diff) | |
| download | mruby-0026d5ff8259ce18bde1bebf3be938dce1ca2227.tar.gz mruby-0026d5ff8259ce18bde1bebf3be938dce1ca2227.zip | |
run make -c mrblib from top
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mruby/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
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 $@ |