[svn-commits] kpfleming: branch 1.4 r48525 - in /branches/1.4: ./
agi/ apps/ build_tools/ c...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Dec 16 14:14:35 MST 2006
Author: kpfleming
Date: Sat Dec 16 15:14:34 2006
New Revision: 48525
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48525
Log:
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:
branches/1.4/build_tools/mkdep
Modified:
branches/1.4/Makefile
branches/1.4/Makefile.moddir_rules
branches/1.4/Makefile.rules
branches/1.4/agi/ (props changed)
branches/1.4/agi/Makefile
branches/1.4/apps/ (props changed)
branches/1.4/cdr/ (props changed)
branches/1.4/channels/ (props changed)
branches/1.4/codecs/ (props changed)
branches/1.4/codecs/gsm/ (props changed)
branches/1.4/codecs/ilbc/ (props changed)
branches/1.4/codecs/lpc10/ (props changed)
branches/1.4/formats/ (props changed)
branches/1.4/funcs/ (props changed)
branches/1.4/main/ (props changed)
branches/1.4/main/Makefile
branches/1.4/main/db1-ast/ (props changed)
branches/1.4/pbx/ (props changed)
branches/1.4/res/ (props changed)
branches/1.4/utils/ (props changed)
branches/1.4/utils/Makefile
Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Dec 16 15:14:34 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/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
@@ -341,19 +337,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
@@ -397,7 +387,6 @@
grep ^C update.out | cut -b4- ; \
fi ; \
rm -f update.out; \
- $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
@@ -629,14 +618,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 defaults.h $(SUBDIRS_DEPEND)
-
sounds:
$(MAKE) -C sounds all
@@ -696,4 +677,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: branches/1.4/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile.moddir_rules?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/Makefile.moddir_rules (original)
+++ branches/1.4/Makefile.moddir_rules Sat Dec 16 15:14:34 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: branches/1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile.rules?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/Makefile.rules (original)
+++ branches/1.4/Makefile.rules Sat Dec 16 15:14:34 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: branches/1.4/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
eagi-test
eagi-sphinx-test
-.depend
+*.d
strcompat.c
Modified: branches/1.4/agi/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/agi/Makefile?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/agi/Makefile (original)
+++ branches/1.4/agi/Makefile Sat Dec 16 15:14:34 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: branches/1.4/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
*.oo
Propchange: branches/1.4/codecs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/codecs/gsm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,1 +1,2 @@
+*.d
lib
Propchange: branches/1.4/codecs/ilbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
*.a
*.so
Propchange: branches/1.4/codecs/lpc10/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
*.a
*.so
Propchange: branches/1.4/formats/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/funcs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,2 +1,2 @@
asterisk
-.depend
+*.d
Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Sat Dec 16 15:14:34 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: branches/1.4/main/db1-ast/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
*.a
*.so
Propchange: branches/1.4/pbx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/res/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: branches/1.4/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 16 15:14:34 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
astman
smsq
stereorize
Modified: branches/1.4/utils/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/utils/Makefile?view=diff&rev=48525&r1=48524&r2=48525
==============================================================================
--- branches/1.4/utils/Makefile (original)
+++ branches/1.4/utils/Makefile Sat Dec 16 15:14:34 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 svn-commits
mailing list