[asterisk-commits] trunk r28055 - /trunk/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu May 18 01:41:53 2006
New Revision: 28055

URL: http://svn.digium.com/view/asterisk?rev=28055&view=rev
Log:
fix file dependency generation so that the resulting files in the subdirectories
are not of zero length (issue #7138, reported/patched by casper, fixed by a
different patch)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=28055&r1=28054&r2=28055&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 18 01:41:53 2006
@@ -284,7 +284,8 @@
 endif
 
 MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-SUBDIRS:=$(MOD_SUBDIRS) utils stdtime agi
+OTHER_SUBDIRS=utils stdtime agi
+SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
 
 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 \
@@ -871,7 +872,8 @@
 valgrind: dont-optimize
 
 depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h 
-	@for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
+	@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
 
 .depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
 	build_tools/mkdep $(CFLAGS) $(wildcard *.c)