- specify that 'depend' is a .PHONY target

- use separate targets instead of a for loop for doing 'make depend' for
  each sub directory

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

diff --git a/Makefile b/Makefile
index 1fd64faf7b180624a2c8e991e10e5318e16a5338..8b32683716defe381731a2670463cc466af1d670 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 
 .EXPORT_ALL_VARIABLES:
 
-.PHONY: sounds clean clean-depend dist-clean all
+.PHONY: sounds clean clean-depend dist-clean all depend
 
 # Create OPTIONS variable
 OPTIONS=
@@ -264,12 +264,15 @@ endif
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-OTHER_SUBDIRS=utils agi
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
+MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
+OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
+SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
 
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
        translate.o file.o pbx.o cli.o md5.o term.o \
@@ -775,9 +778,13 @@ dont-optimize: _all
 
 valgrind: dont-optimize
 
-depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h 
-       @for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
-       @for x in $(OTHER_SUBDIRS); do CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
+$(MOD_SUBDIRS_DEPEND):
+       @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+$(OTHER_SUBDIRS_DEPEND):
+       @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h $(SUBDIRS_DEPEND)
 
 .depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
        build_tools/mkdep $(CFLAGS) $(wildcard *.c)

diff --git a/agi/Makefile b/agi/Makefile
index 21c1d57992b8850d91628f7ea17c4cbd24b99bfd..d73f2382cc69f63f2e1e2c6f9d39e8a1e53c8fa1 100644 (file)
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 

diff --git a/apps/Makefile b/apps/Makefile
index 7ceac360c8f723a6724ca9412b0ee412b1f6c571..012858202138c7c132c082a31052a688d4dbb11e 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/cdr/Makefile b/cdr/Makefile
index ccefb060e3c736e691ac64c7ebd522d93f9a2299..1b4df79785d598586dfdea5dfb33f709f637f580 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/channels/Makefile b/channels/Makefile
index c9b0fc36e5747b96899d399caafb79c0907a950d..93429b6b422a8bfe23a37476e9d84a3b6841c48c 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/codecs/Makefile b/codecs/Makefile
index 4ac7aa976d67c0d96c9163200df894b4ba7ab1b8..1528ee374f1eac692e064f83ed2ccf0dabffbb12 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/formats/Makefile b/formats/Makefile
index ca2503d1d5518eaa8575421fb182da5117ef45cc..1a306d2f2635e92d28afb2c224acfc5cd72ae974 100644 (file)
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/funcs/Makefile b/funcs/Makefile
index 827458ba9a16fb0391308f4df53ed86947295f4d..b4310f9bf8bae1e1a0d347468db52bb26d2ad71d 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/pbx/Makefile b/pbx/Makefile
index a749115717e30106c32bf9c288861330dc1b1fbf..795911c94e1421fd665aff73bfb59c38e79eca24 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/res/Makefile b/res/Makefile
index 4b332194d2646b627d182cc3e8db4867572a3225..6b7dd3b0c5f013849d611ad2ea1de8c150c2fae7 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

diff --git a/utils/Makefile b/utils/Makefile
index 54e4d15accb497928d16253b72802867797b4373..2432ad2febec9e84ed4c5eeab2fe4fb1738c5965 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all
+.PHONY: clean clean-depend all depend
 
 UTILS:=astman smsq stereorize streamplayer aelparse