use new (separate) dependencies file from menuselect

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35895 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 7af2cca9bc01d701489b074446bbc6382dc3291f..59e6063297ff57d82eb30655f334c594fe325267 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,7 @@ USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
 ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
+  include menuselect.makedeps
 endif
 
 ifneq ($(wildcard makeopts),)
@@ -512,7 +513,7 @@ dist-clean: clean
        @$(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 @@ mxml/libmxml.a:
 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)

diff --git a/apps/Makefile b/apps/Makefile
index 01d70c6af34a8cc4919408ff15e29f7eaff7786a..7c86dfa32febf15e6890b9a11b3de9c61aada323 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -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)))

diff --git a/cdr/Makefile b/cdr/Makefile
index 5b1f5071b4c22b539a2311a69bbf494ca2e9ceea..1e779126926dbba69736de0d710fc43d8159ddcb 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -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)))

diff --git a/channels/Makefile b/channels/Makefile
index e65ce1256680cc4701644a729910b178dfb23859..5af2f3c02174047a9e22649fa3e4e2d0c420321d 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -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)))

diff --git a/codecs/Makefile b/codecs/Makefile
index df84f3b5ec80f0ae2ce3db2773e6643f4aa7702a..61c551078085293c1304c47393907aa8a0410bee 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -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)))

diff --git a/formats/Makefile b/formats/Makefile
index 351f1e8a105194fb3b86e531ab6e2e3290b42f5d..06195d03c0df18b05d79f9ed5dd7f28bedea4e4f 100644 (file)
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -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)))

diff --git a/funcs/Makefile b/funcs/Makefile
index 381a3d72cd4aea7e08f5161a2421ec8762dfb1a0..5a8845c1843c80c575ee547dc2056e2804ab8135 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -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)))

diff --git a/pbx/Makefile b/pbx/Makefile
index 6b9beb970a0558bd85b6d9c9e58e20003992a2d8..7680943cb038407961f555b111ff3afb16feb05f 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -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)))

diff --git a/res/Makefile b/res/Makefile
index 3fc5a406bc5ae28de37613a51d42e4b9eb7dfda8..de6e90ac614925c7d997f17b07db224e229924a8 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -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)))

diff --git a/sounds/Makefile b/sounds/Makefile
index 7a5d60d0442af249ec505c2dacc9d7b5c3c1a259..a55b765d412708d39c51a7657c04e8a97db825b1 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -52,6 +52,8 @@ MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz)
 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-extra-%.tar.gz:
 asterisk-moh-%.tar.gz:
        @wget $(WGET_ARGS) $(MOH_URL)/$@
 
-all:   $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
-
 dist-clean:
        rm -f *.tar.gz