[asterisk-commits] tzafrir: branch group/make_simple r40831 - /team/group/make_simple/Makefile

[asterisk-commits at lists.digium.com]

Author: tzafrir
Date: Mon Aug 21 23:47:23 2006
New Revision: 40831

URL: http://svn.digium.com/view/asterisk?rev=40831&view=rev
Log:
Set up a varable MOD_SUBDIRS_BASE for $(filter-out main,$(MOD_SUBDIRS))

Modified:
    team/group/make_simple/Makefile

Modified: team/group/make_simple/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/make_simple/Makefile?rev=40831&r1=40830&r2=40831&view=diff
==============================================================================
--- team/group/make_simple/Makefile (original)
+++ team/group/make_simple/Makefile Mon Aug 21 23:47:23 2006
@@ -195,7 +195,8 @@
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
+MOD_SUBDIRS_BASE:=res channels pbx apps codecs formats cdr funcs
+MOD_SUBDIRS:=$(MOD_SUBDIRS_BASE) main
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -272,7 +273,7 @@
 # a parallel build, since if there are modules selected to be embedded the
 # directories containing them must be completed before the main Asterisk
 # binary can be built
-main: $(filter-out main,$(MOD_SUBDIRS))
+main: $(MOD_SUBDIRS_BASE)
 
 $(MOD_SUBDIRS):
 	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
@@ -653,7 +654,7 @@
 	@cd mxml && unset CC CFLAGS LDFLAGS && test -f config.h || ./configure --build=$(BUILD_PLATFORM) --host=$(BUILD_PLATFORM)
 	$(MAKE) -C mxml libmxml.a
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
+menuselect-tree: $(foreach dir,$(MOD_SUBDIRS_BASE),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
 	@echo "Generating input for menuselect ..."
 	@build_tools/prep_moduledeps > $@