[asterisk-commits] kpfleming: branch 1.6.0 r157165 - /branches/1.6.0/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Sat Nov 15 13:47:36 2008
New Revision: 157165

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157165
Log:
Merged revisions 157164 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r157164 | kpfleming | 2008-11-15 20:45:19 +0100 (Sat, 15 Nov 2008) | 13 lines
  
  Merged revisions 157162-157163 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r157162 | kpfleming | 2008-11-15 20:24:24 +0100 (Sat, 15 Nov 2008) | 1 line
    
    dist-clean should remove dependency information files as well
  ........
    r157163 | kpfleming | 2008-11-15 20:31:03 +0100 (Sat, 15 Nov 2008) | 1 line
    
    when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/Makefile.moddir_rules
    branches/1.6.0/Makefile.rules

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=157165&r1=157164&r2=157165
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Sat Nov 15 13:47:36 2008
@@ -425,7 +425,9 @@
 $(SUBDIRS_DIST_CLEAN):
 	@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
 
-clean: $(SUBDIRS_CLEAN)
+clean: $(SUBDIRS_CLEAN) _clean
+
+_clean:
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f main/version.c
@@ -435,7 +437,7 @@
 
 dist-clean: distclean
 
-distclean: $(SUBDIRS_DIST_CLEAN) clean
+distclean: $(SUBDIRS_DIST_CLEAN) _clean
 	@$(MAKE) -C menuselect dist-clean
 	@$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
@@ -887,6 +889,6 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs _clean
 
 FORCE:

Modified: branches/1.6.0/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile.moddir_rules?view=diff&rev=157165&r1=157164&r2=157165
==============================================================================
--- branches/1.6.0/Makefile.moddir_rules (original)
+++ branches/1.6.0/Makefile.moddir_rules Sat Nov 15 13:47:36 2008
@@ -124,6 +124,7 @@
 dist-clean::
 	rm -f .*.moduleinfo .moduleinfo
 	rm -f .*.makeopts .makeopts
+	rm -f .*.d
 
 .%.moduleinfo: %.c
 	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@

Modified: branches/1.6.0/Makefile.rules
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile.rules?view=diff&rev=157165&r1=157164&r2=157165
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Sat Nov 15 13:47:36 2008
@@ -95,4 +95,4 @@
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
 
-dist-clean::
+dist-clean:: clean