diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-18 14:29:14 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-18 14:29:14 +0900 |
| commit | 332565e3ba7fb06e1747ed3a7b7a77c9d0b2018b (patch) | |
| tree | a832252207d0880fefcfdaf5666b1c0706e08cfe | |
| parent | 7fdc42355ad927dea6751c0b5d06826b3b2afda5 (diff) | |
| download | mruby-332565e3ba7fb06e1747ed3a7b7a77c9d0b2018b.tar.gz mruby-332565e3ba7fb06e1747ed3a7b7a77c9d0b2018b.zip | |
remove confusing dependency; run "make" before "make test"
| -rw-r--r-- | test/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/test/Makefile b/test/Makefile index 8ee12dbf1..cb6ac3a5e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -57,21 +57,16 @@ else CFLAGS = -O3 endif ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -ifeq ($(OS),Windows_NT) - MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" -else - MAKE_FLAGS = CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)' -endif ############################## # generic build targets, rules .PHONY : test -all : $(LIBR) $(EXE) +all : $(EXE) ./$(EXE) # executable constructed using linker from object files -$(EXE) : $(LIBR) $(OBJS) +$(EXE) : $(OBJS) $(LL) -o $@ $(CFLAGS) $(OBJS) $(LIBR) $(LIBS) -include $(OBJS:.o=.d) @@ -80,17 +75,10 @@ $(EXE) : $(LIBR) $(OBJS) $(OBJS) : %.o : %.c $(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@ -# C library compile -$(LIBR) : - @$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS) - # Compile C source from merged mruby source $(CLIB) : $(RLIB) $(MRBC) $(INIT) $(MRBC) -Bmrbtest_irep -o$(DLIB) $(RLIB); cat $(INIT) $(DLIB) > $@ -$(MRBC) : ../src/opcode.h ../src/codegen.c ../src/parse.y - $(MAKE) -C ../tools/mrbc $(MAKE_FLAGS) - # merge mruby sources $(RLIB) : $(ASSLIB) $(MRBS) cat $? > $@ |