- 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
19 years ago · 55e8a60363
parent c95e633c8a
commit 55e8a60363
11 changed files with 23 additions and 16 deletions
--- a/19
+++ b/19
@ -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)
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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