diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-11-22 19:00:39 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-11-22 19:00:39 +0800 |
| commit | 2a2e20680966c674786011450eb59abb595147fd (patch) | |
| tree | edd07aa0711ddf67bc905561d889fadc876df920 /test/Makefile | |
| parent | 35edbb06883b0c943ec1b1f7d4662b90b26375b6 (diff) | |
| download | mruby-2a2e20680966c674786011450eb59abb595147fd.tar.gz mruby-2a2e20680966c674786011450eb59abb595147fd.zip | |
Deactivate / Activate GEMs Flag introduced into mrbtest
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile index 1cadd90a2..dfbcd8ce2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -8,19 +8,28 @@ BASEDIR = . TARGET := mrbtest LIBR := ../lib/libmruby.a -MAKEFILE_GEM_LIST := $(MRUBY_ROOT)/mrbgems/g/MakefileGemList -ifeq ($(wildcard $(MAKEFILE_GEM_LIST)),) +ifeq ($(strip $(ENABLE_GEMS)),) + # by default GEMs are deactivated + ENABLE_GEMS = false +endif + +ifeq ($(ENABLE_GEMS),false) GEM_ARCHIVE_FILES = else - include $(MAKEFILE_GEM_LIST) + GEMDIR := ../mrbgems + GEMDLIB := $(GEMDIR)/g/mrbgemtest.ctmp + MAKEFILE_GEM_LIST := $(MRUBY_ROOT)/mrbgems/g/MakefileGemList + ifeq ($(wildcard $(MAKEFILE_GEM_LIST)),) + GEM_ARCHIVE_FILES = + else + include $(MAKEFILE_GEM_LIST) + endif endif MLIB := $(TARGET).o CLIB := $(TARGET).c INIT := init_$(TARGET).c DLIB := $(TARGET).ctmp -GEMDIR := ../mrbgems -GEMDLIB := $(GEMDIR)/g/mrbgemtest.ctmp RLIB := $(TARGET).rbtmp DEPLIB := $(TARGET).d driver.d ASSLIB := $(BASEDIR)/assert.rb @@ -96,7 +105,9 @@ $(OBJS) : %.o : %.c # Compile C source from merged mruby source $(CLIB) : $(DLIB) $(INIT) +ifeq ($(ENABLE_GEMS),true) @$(MAKE) prepare-test -C $(GEMDIR) +endif $(CAT) $(INIT) $(DLIB) $(GEMDLIB) > $@ $(DLIB) : $(RLIB) $(MRBC) |