[asterisk-commits] trunk r35895 - in /trunk: ./ apps/ cdr/ channels/ codecs/ formats/ funcs/ pbx...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Jun 25 01:50:15 MST 2006


Author: kpfleming
Date: Sun Jun 25 03:50:14 2006
New Revision: 35895

URL: http://svn.digium.com/view/asterisk?rev=35895&view=rev
Log:
use new (separate) dependencies file from menuselect

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/apps/Makefile
    trunk/cdr/Makefile
    trunk/channels/Makefile
    trunk/codecs/Makefile
    trunk/formats/Makefile
    trunk/funcs/Makefile
    trunk/pbx/Makefile
    trunk/res/Makefile
    trunk/sounds/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 25 03:50:14 2006
@@ -16,6 +16,7 @@
 testexpr2
 makeopts
 menuselect.makeopts
+menuselect.makedeps
 config.status
 config.log
 makeopts.xml

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Jun 25 03:50:14 2006
@@ -121,6 +121,7 @@
 
 ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
+  include menuselect.makedeps
 endif
 
 ifneq ($(wildcard makeopts),)
@@ -512,7 +513,7 @@
 	@$(MAKE) -C mxml clean
 	@$(MAKE) -C menuselect dist-clean
 	@$(MAKE) -C sounds dist-clean
-	rm -f menuselect.makeopts makeopts makeopts.xml
+	rm -f menuselect.makeopts makeopts makeopts.xml menuselect.makedeps
 	rm -f config.log config.status
 	rm -rf autom4te.cache
 	rm -f include/autoconfig.h
@@ -885,6 +886,5 @@
 makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps > $@
-	@sed -i -e /MENUSELECT_DEPENDS/d menuselect.makeopts
 
 .PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS)

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))

Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Sun Jun 25 03:50:14 2006
@@ -11,10 +11,9 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all depend uninstall
-
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))

Modified: trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/formats/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/formats/Makefile (original)
+++ trunk/formats/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))

Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))

Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Sun Jun 25 03:50:14 2006
@@ -11,6 +11,7 @@
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts
+  include ../menuselect.makedeps
 endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))

Modified: trunk/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/sounds/Makefile?rev=35895&r1=35894&r2=35895&view=diff
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Sun Jun 25 03:50:14 2006
@@ -52,6 +52,8 @@
 MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 WGET_ARGS:=--continue
 
+all:	$(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
+
 $(SOUNDS_DIR)/.asterisk-core-sounds-en-%:
 	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
 	if ! test -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
@@ -92,8 +94,6 @@
 asterisk-moh-%.tar.gz:
 	@wget $(WGET_ARGS) $(MOH_URL)/$@
 
-all:	$(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
-
 dist-clean:
 	rm -f *.tar.gz
 



More information about the asterisk-commits mailing list