[asterisk-commits] tilghman: trunk r134312 - /trunk/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 29 18:00:45 2008
New Revision: 134312

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134312
Log:
Minor changes to reduce packaging changes made by the Fedora maintainer.
(closes issue #12974)
 Reported by: jcollie
 Patches: 
       0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=134312&r1=134311&r2=134312
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jul 29 18:00:45 2008
@@ -221,10 +221,16 @@
 endif
 
 ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+  ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
+    ASTCFLAGS+=-pipe
+  endif
+endif
+
+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
+  ASTCFLAGS+=-Wall
+endif
+
+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
@@ -237,8 +243,10 @@
   ASTLDFLAGS+=-L/usr/local/lib
 endif
 
-ifneq ($(PROC),ultrasparc)
-  ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+  ifneq ($(PROC),ultrasparc)
+    ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+  endif
 endif
 
 ifeq ($(PROC),ppc)