[asterisk-commits] kpfleming: trunk r87462 - in /trunk: ./ Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Oct 29 17:05:17 2007
New Revision: 87462

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

........
r87460 | kpfleming | 2007-10-29 17:04:29 -0500 (Mon, 29 Oct 2007) | 2 lines

don't put '-pipe' into ASTCFLAGS if '-save-temps' is already there (used when debugging preprocessor issues) because the compiler will whine about each compile command

........

Modified:
    trunk/   (props changed)
    trunk/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=87462&r1=87461&r2=87462
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Oct 29 17:05:17 2007
@@ -200,7 +200,11 @@
   endif
 endif
 
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
+ASTCFLAGS+=-pipe
+endif
+
+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h