From 660eb545dbb60bbf0c338a3b381aef4dc3734c51 Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Fri, 23 Nov 2012 19:42:10 +0800 Subject: Respect dynamic GEMS.active file in mrbgems/Makefile4gem --- mrbgems/Makefile4gem | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mrbgems/Makefile4gem b/mrbgems/Makefile4gem index 3a2e74096..a24b162ab 100644 --- a/mrbgems/Makefile4gem +++ b/mrbgems/Makefile4gem @@ -26,6 +26,11 @@ endif GEM_PACKAGE := mrb-$(GEM)-gem.a +ifeq ($(strip $(ACTIVE_GEMS)),) + # the default file which contains the active GEMs + ACTIVE_GEMS = GEMS.active +endif + # Default rules which are calling the # gem specific gem-all and gem-clean # implementations of a gem @@ -44,14 +49,14 @@ gem_mixlib.c : gem_mrblib_header.ctmp gem_mrblib_irep.ctmp gem_mixlib_init.ctmp cat $^ > $@ gem_mixlib_init.ctmp : - $(MRUBY_ROOT)mrbgems/generator gem_mixlib $(GEM) > $@ + $(MRUBY_ROOT)mrbgems/generator gem_mixlib $(GEM) "$(ACTIVE_GEMS)" > $@ # Building target for C files gem-c-files : gem_srclib.o $(AR) rs $(GEM_PACKAGE) $(GEM_OBJECTS) $< gem_srclib.c : - $(MRUBY_ROOT)mrbgems/generator gem_srclib $(GEM) > $@ + $(MRUBY_ROOT)mrbgems/generator gem_srclib $(GEM) "$(ACTIVE_GEMS)" > $@ # Building target for Ruby Files gem-rb-files : gem_mrblib.o @@ -61,10 +66,10 @@ gem_mrblib.c : gem_mrblib_header.ctmp gem_mrblib_irep.ctmp gem_mrblib_init.ctmp cat $^ > $@ gem_mrblib_header.ctmp : - $(MRUBY_ROOT)mrbgems/generator gem_mrblib > $@ + $(MRUBY_ROOT)mrbgems/generator gem_mrblib "$(ACTIVE_GEMS)" > $@ gem_mrblib_init.ctmp : - $(MRUBY_ROOT)mrbgems/generator gem_mrblib $(GEM) > $@ + $(MRUBY_ROOT)mrbgems/generator gem_mrblib $(GEM) "$(ACTIVE_GEMS)" > $@ gem_mrblib_irep.ctmp : gem_mrblib.rbtmp $(MRUBY_ROOT)bin/mrbc -Bgem_mrblib_irep_$(GEM) -o$@ $< -- cgit v1.2.3