[asterisk-commits] kpfleming: trunk r48527 - in /trunk: ./ agi/ apps/ build_tools/ cdr/ channels...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sat Dec 16 14:24:53 MST 2006


Author: kpfleming
Date: Sat Dec 16 15:24:52 2006
New Revision: 48527

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48527
Log:
Merged revisions 48525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48525 | kpfleming | 2006-12-16 15:14:34 -0600 (Sat, 16 Dec 2006) | 2 lines

simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script

........

Removed:
    trunk/build_tools/mkdep
Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/Makefile.moddir_rules
    trunk/Makefile.rules
    trunk/agi/   (props changed)
    trunk/agi/Makefile
    trunk/apps/   (props changed)
    trunk/cdr/   (props changed)
    trunk/channels/   (props changed)
    trunk/codecs/   (props changed)
    trunk/codecs/gsm/   (props changed)
    trunk/codecs/ilbc/   (props changed)
    trunk/codecs/lpc10/   (props changed)
    trunk/formats/   (props changed)
    trunk/funcs/   (props changed)
    trunk/main/   (props changed)
    trunk/main/Makefile
    trunk/main/db1-ast/   (props changed)
    trunk/pbx/   (props changed)
    trunk/res/   (props changed)
    trunk/utils/   (props changed)
    trunk/utils/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Dec 16 15:24:52 2006
@@ -239,10 +239,6 @@
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_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:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
 SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
 MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
 MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -306,7 +302,7 @@
 	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
 	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
 
-$(SUBDIRS): depend makeopts.embed_rules
+$(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 # ensure that all module subdirectories are processed before 'main' during
 # a parallel build, since if there are modules selected to be embedded the
@@ -348,19 +344,13 @@
 	fi
 	@rm -f $@.tmp
 
-$(SUBDIRS_CLEAN_DEPEND):
-	@$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend
-
 $(SUBDIRS_CLEAN):
 	@$(MAKE) --no-print-directory -C $(@:-clean=) clean
 
-clean-depend: $(SUBDIRS_CLEAN_DEPEND)
-
-clean: $(SUBDIRS_CLEAN) clean-depend
+clean: $(SUBDIRS_CLEAN)
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f include/asterisk/version.h
-	rm -f .depend
 	@$(MAKE) -C menuselect clean
 	cp -f .cleancount .lastclean
 
@@ -404,7 +394,6 @@
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
-		$(MAKE) clean-depend; \
 	else \
 		echo "Not under version control";  \
 	fi
@@ -636,14 +625,6 @@
 		echo "We could not install init scripts for your operating system."; \
 	fi
 
-$(MOD_SUBDIRS_DEPEND):
-	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-$(OTHER_SUBDIRS_DEPEND):
-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h include/asterisk/build.h defaults.h $(SUBDIRS_DEPEND)
-
 sounds:
 	$(MAKE) -C sounds all
 
@@ -703,4 +684,4 @@
 	@echo "Generating input for menuselect ..."
 	@build_tools/prep_moduledeps > $@
 
-.PHONY: menuselect main sounds clean clean-depend dist-clean distclean all prereqs depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: trunk/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Sat Dec 16 15:24:52 2006
@@ -40,7 +40,7 @@
 modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
 
-.PHONY: clean clean-depend depend uninstall _all
+.PHONY: clean uninstall _all
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
@@ -67,11 +67,9 @@
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
 
-clean-depend::
-	rm -f .depend
-
-clean:: clean-depend
+clean::
 	rm -f *.so *.o *.oo
+	rm -f .*.o.d .*.oo.d
 	rm -f modules.link
 
 install:: all
@@ -79,11 +77,6 @@
 
 uninstall::
 
-ifneq ($(wildcard .depend),)
-  include .depend
+ifneq ($(wildcard .*.d),)
+   include .*.d
 endif
-
-depend: .depend
-
-.depend:
-	../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`

Modified: trunk/Makefile.rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.rules?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Sat Dec 16 15:24:52 2006
@@ -38,11 +38,19 @@
 
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
+endif
 
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
 	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
+endif
 
 %.c: %.y
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"

Propchange: trunk/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
 eagi-test
 eagi-sphinx-test
-.depend
+*.d
 strcompat.c

Modified: trunk/agi/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/agi/Makefile?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/agi/Makefile (original)
+++ trunk/agi/Makefile Sat Dec 16 15:24:52 2006
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all depend uninstall
+.PHONY: clean all uninstall
 
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
@@ -37,18 +37,11 @@
 uninstall:
 	for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
 
-clean-depend:
-	rm -f .depend
-
-clean: clean-depend
+clean:
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
+	rm -f .*.o.d .*.oo.d
 	rm -f strcompat.c
 
-ifneq ($(wildcard .depend),)
-  include .depend
+ifneq ($(wildcard .*.d),)
+   include .*.d
 endif
-
-depend: .depend
-
-.depend:
-	../build_tools/mkdep $(CFLAGS) `ls *.c`

Propchange: trunk/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 *.oo

Propchange: trunk/codecs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/codecs/gsm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,1 +1,2 @@
+*.d
 lib

Propchange: trunk/codecs/ilbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
 *.a
 *.so

Propchange: trunk/codecs/lpc10/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
 *.a
 *.so

Propchange: trunk/formats/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/funcs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,2 +1,2 @@
 asterisk
-.depend
+*.d

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Sat Dec 16 15:24:52 2006
@@ -140,7 +140,6 @@
 
 clean::
 	rm -f asterisk
-	rm -f .depend
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean

Propchange: trunk/main/db1-ast/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
 *.a
 *.so

Propchange: trunk/pbx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/res/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 *.a
 *.so
 modules.link

Propchange: trunk/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:24:52 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
 astman
 smsq
 stereorize

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?view=diff&rev=48527&r1=48526&r2=48527
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Sat Dec 16 15:24:52 2006
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-.PHONY: clean clean-depend all depend uninstall
+.PHONY: clean all uninstall
 
 ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted
 UTILS:=$(ALL_UTILS)
@@ -51,11 +51,9 @@
 uninstall:
 	for x in $(ALL_UTILS); do rm -f $$x $(DESTDIR)$(ASTSBINDIR)/$$x; done
 
-clean-depend:
-	rm -f .depend
-
-clean: clean-depend
+clean:
 	rm -f *.o $(ALL_UTILS) check_expr
+	rm -f .*.o.d .*.oo.d
 	rm -f md5.c strcompat.c ast_expr2.c ast_expr2f.c pbx_ael.c
 	rm -f aelparse.c aelbison.c
 
@@ -122,11 +120,6 @@
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
 
-ifneq ($(wildcard .depend),)
-  include .depend
+ifneq ($(wildcard .*.d),)
+   include .*.d
 endif
-
-depend: .depend
-
-.depend:
-	../build_tools/mkdep $(ASTCFLAGS) `ls *.c`



More information about the asterisk-commits mailing list