summaryrefslogtreecommitdiffhomepage
path: root/test/Makefile
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-09-22 01:16:26 +0800
committerDaniel Bovensiepen <[email protected]>2012-09-22 01:16:26 +0800
commit0e7d5a2e4bcca01a41ea00324261818440808e6f (patch)
treecb0e6469f099b9262809c24efa223033196305ab /test/Makefile
parent80b7f45fd17bac6f3623c92eceda26f6fbf72a64 (diff)
downloadmruby-0e7d5a2e4bcca01a41ea00324261818440808e6f.tar.gz
mruby-0e7d5a2e4bcca01a41ea00324261818440808e6f.zip
Move Gem Tests into the main Test target
Diffstat (limited to 'test/Makefile')
-rw-r--r--test/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile
index 18bc79b5a..efabdc367 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -68,13 +68,16 @@ $(OBJS) : %.o : %.c
$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
# Compile C source from merged mruby source
-$(CLIB) : $(RLIB) $(MRBC) $(INIT)
- $(MRBC) -Bmrbtest_irep -o$(DLIB) $(RLIB); $(CAT) $(INIT) $(DLIB) > $@
+$(CLIB) : ../mrbgems/g/mrbgemtest.ctmp $(RLIB) $(MRBC) $(INIT)
+ $(MRBC) -Bmrbtest_irep -o$(DLIB) $(RLIB); $(CAT) $(INIT) $(DLIB) ../mrbgems/g/mrbgemtest.ctmp > $@
# merge mruby sources
$(RLIB) : $(ASSLIB) $(MRBS)
$(CAT) $(ASSLIB) $(MRBS) > $@
+../mrbgems/g/mrbgemtest.ctmp :
+ @$(MAKE) prepare-test -C ../mrbgems
+
# clean up
.PHONY : clean
clean :