[asterisk-commits] kpfleming: branch 1.6.1 r159535 - in /branches/1.6.1: ./ agi/ utils/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Nov 26 13:17:41 2008
New Revision: 159535

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

................
  r159534 | kpfleming | 2008-11-26 13:08:56 -0600 (Wed, 26 Nov 2008) | 11 lines
  
  Merged revisions 159476 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159476 | kpfleming | 2008-11-26 12:36:24 -0600 (Wed, 26 Nov 2008) | 7 lines
    
    simplify (and slightly bug-fix) the recent developer-oriented COMPILE_DOUBLE mode
    
    ensure that 'make clean' removes dependency files for .i files that are created in COMPILE_DOUBLE mode
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile.moddir_rules
    branches/1.6.1/Makefile.rules
    branches/1.6.1/agi/Makefile
    branches/1.6.1/utils/Makefile

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

Modified: branches/1.6.1/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile.moddir_rules?view=diff&rev=159535&r1=159534&r2=159535
==============================================================================
--- branches/1.6.1/Makefile.moddir_rules (original)
+++ branches/1.6.1/Makefile.moddir_rules Wed Nov 26 13:17:41 2008
@@ -111,7 +111,7 @@
 
 clean::
 	rm -f *.so *.o *.oo *.eo *.i *.ii
-	rm -f .*.o.d .*.oo.d
+	rm -f .*.d
 	rm -f *.s *.i
 	rm -f modules.link
 
@@ -124,7 +124,6 @@
 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.1/Makefile.rules
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile.rules?view=diff&rev=159535&r1=159534&r2=159535
==============================================================================
--- branches/1.6.1/Makefile.rules (original)
+++ branches/1.6.1/Makefile.rules Wed Nov 26 13:17:41 2008
@@ -18,6 +18,11 @@
 -include $(ASTTOPDIR)/makeopts
 
 .PHONY: dist-clean
+
+# If 'make' decides to create intermediate files to satisfy a build requirement
+# (like producing a .i from a .c), we want to keep them, so tell make to keep
+# all intermediate files
+.SECONDARY:
 
 # extra cflags to build dependencies. Recursively expanded.
 MAKE_DEPS=-MD -MT $@ -MF .$(subst /,_,$@).d -MP
@@ -74,13 +79,9 @@
 endif
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
 
+ifneq ($(COMPILE_DOUBLE),yes)
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-ifeq ($(COMPILE_DOUBLE),yes)
-	$(CMD_PREFIX) $(CC) -o $(@:%.o=%.i) -E $< $(CC_CFLAGS) $(MAKE_DEPS)
-	$(CMD_PREFIX) $(CC) -o /dev/null -c $(@:%.o=%.i) $(CC_CFLAGS) $(OPTIMIZE)
-	$(CMD_PREFIX) $(CC) -o $@ -c $(@:%.o=%.i) $(CC_CFLAGS)
-else
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
 endif
 
@@ -95,13 +96,9 @@
 endif
 	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
 
+ifneq ($(COMPILE_DOUBLE),yes)
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-ifeq ($(COMPILE_DOUBLE),yes)
-	$(CMD_PREFIX) $(CXX) -o $(@:%.oo=%.ii) -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
-	$(CMD_PREFIX) $(CXX) -o /dev/null -c $(@:%.oo=%.ii) $(CXX_CFLAGS) $(MAKE_DEPS) $(OPTIMIZE)
-	$(CMD_PREFIX) $(CXX) -o $@ -c $(@:%.oo=%.ii) $(CXX_CFLAGS) $(MAKE_DEPS)
-else
 	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
 endif
 

Modified: branches/1.6.1/agi/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/agi/Makefile?view=diff&rev=159535&r1=159534&r2=159535
==============================================================================
--- branches/1.6.1/agi/Makefile (original)
+++ branches/1.6.1/agi/Makefile Wed Nov 26 13:17:41 2008
@@ -48,8 +48,7 @@
 
 clean:
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
-	rm -f .*.o.d .*.oo.d
-	rm -f *.s *.i
+	rm -f .*.d *.s *.i
 	rm -f strcompat.c
 
 ifneq ($(wildcard .*.d),)

Modified: branches/1.6.1/utils/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/utils/Makefile?view=diff&rev=159535&r1=159534&r2=159535
==============================================================================
--- branches/1.6.1/utils/Makefile (original)
+++ branches/1.6.1/utils/Makefile Wed Nov 26 13:17:41 2008
@@ -73,7 +73,7 @@
 
 clean:
 	rm -f *.o $(ALL_UTILS) check_expr
-	rm -f .*.o.d .*.oo.d
+	rm -f .*.d
 	rm -f *.s *.i
 	rm -f md5.c strcompat.c ast_expr2.c ast_expr2f.c pbx_ael.c pval.c hashtab.c
 	rm -f aelparse.c aelbison.c conf2ael