diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-29 23:00:45 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-29 23:00:45 +0000 |
| commit | 735c7cda3cc1ca453fa161d838e3fbf3fac24c4e (patch) | |
| tree | d62180d0dd242a7f6c1116ed00e2a9a36a4445cc /Makefile | |
| parent | 0ce79e5a0653c0d2532304c07d0f83fcc92209a6 (diff) | |
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)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) 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) |