From 2c03a9624d111a38478aa90a90d13bdd15f52795 Mon Sep 17 00:00:00 2001 From: paulc Date: Mon, 1 Jun 2009 16:06:14 +0000 Subject: [PATCH] Use the system detected CFLAGS instead of hardcoding -O2 git-svn-id: http://yate.null.ro/svn/yate/trunk@2673 acf43c95-373e-0410-b603-e72c3f656dc1 --- Makefile.in | 2 +- clients/Makefile.in | 2 +- clients/qt4/Makefile.in | 2 +- configure.in | 1 + engine/Makefile.in | 4 ++-- libs/ilbc/Makefile.in | 2 +- libs/yiax/Makefile.in | 2 +- libs/yjingle/Makefile.in | 2 +- libs/ymgcp/Makefile.in | 2 +- libs/ymodem/Makefile.in | 2 +- libs/ypbx/Makefile.in | 2 +- libs/yrtp/Makefile.in | 2 +- libs/ysig/Makefile.in | 2 +- libs/ysip/Makefile.in | 2 +- libs/yxml/Makefile.in | 2 +- modules/Makefile.in | 4 ++-- 16 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 649b7e27..06f6aaa8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,7 +12,7 @@ SED := sed DEFS := LIBTHR:= @THREAD_LIB@ INCLUDES := -I. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ LDCONFIG:=true diff --git a/clients/Makefile.in b/clients/Makefile.in index 964393a2..cc927eb2 100644 --- a/clients/Makefile.in +++ b/clients/Makefile.in @@ -12,7 +12,7 @@ SED := sed DEFS := LIBTHR:= @THREAD_LIB@ INCLUDES := -I.. -I@top_srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L.. -lyate INCFILES := @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h ../yateversn.h diff --git a/clients/qt4/Makefile.in b/clients/qt4/Makefile.in index 3fd1fc1e..cfb73695 100644 --- a/clients/qt4/Makefile.in +++ b/clients/qt4/Makefile.in @@ -10,7 +10,7 @@ MOC := @QT4_MOC@ DEFS:= INCLUDES:=-I. -I@srcdir@ -I@top_srcdir@ @QT4_INC@ -CXXFLAGS:=$(CXXFLAGS) @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CXXFLAGS:=$(CXXFLAGS) @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatecbase.h @srcdir@/qt4client.h diff --git a/configure.in b/configure.in index c015a561..4b0fdb5d 100644 --- a/configure.in +++ b/configure.in @@ -880,6 +880,7 @@ fi INSTALL_D="install -D" +CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| *\)-g[[0-9]]*//' | sed 's/[[[:space:]]]\{2,\}/ /g'` MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK" MODULE_CPPFLAGS="-fno-check-new $RTTI_OPT $MODULE_CFLAGS" MODULE_LDRELAX="-export-dynamic -shared" diff --git a/engine/Makefile.in b/engine/Makefile.in index 205cbff5..7f3892fd 100644 --- a/engine/Makefile.in +++ b/engine/Makefile.in @@ -11,8 +11,8 @@ DEFS := LIBAUX:= @DLOPEN_LIB@ LIBTHR:= -lpthread INCLUDES := -I.. -I@top_srcdir@ -CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@ -CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@ +CPPFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ LDCONFIG:=true diff --git a/libs/ilbc/Makefile.in b/libs/ilbc/Makefile.in index 8cc0bd80..79b349de 100644 --- a/libs/ilbc/Makefile.in +++ b/libs/ilbc/Makefile.in @@ -6,7 +6,7 @@ AR := ar SED := sed DEFS := INCLUDES := -I@top_srcdir@ -CFLAGS := -O3 -funroll-loops -fomit-frame-pointer -fsigned-char @MODULE_CFLAGS@ +CFLAGS := @CFLAGS@ -O3 -funroll-loops -fomit-frame-pointer -fsigned-char @MODULE_CFLAGS@ LDFLAGS:= @LDFLAGS@ PROGS= diff --git a/libs/yiax/Makefile.in b/libs/yiax/Makefile.in index cc3baa40..ee3465cf 100644 --- a/libs/yiax/Makefile.in +++ b/libs/yiax/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yateiax.h diff --git a/libs/yjingle/Makefile.in b/libs/yjingle/Makefile.in index 3b089924..e12ac3f8 100644 --- a/libs/yjingle/Makefile.in +++ b/libs/yjingle/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/tinystr.h @srcdir@/../yxml/tinyxml.h @srcdir@/xmlparser.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h diff --git a/libs/ymgcp/Makefile.in b/libs/ymgcp/Makefile.in index 0627494c..46c45937 100644 --- a/libs/ymgcp/Makefile.in +++ b/libs/ymgcp/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemgcp.h diff --git a/libs/ymodem/Makefile.in b/libs/ymodem/Makefile.in index c3195fda..319af600 100644 --- a/libs/ymodem/Makefile.in +++ b/libs/ymodem/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemodem.h diff --git a/libs/ypbx/Makefile.in b/libs/ypbx/Makefile.in index d4adf964..3cbffad8 100644 --- a/libs/ypbx/Makefile.in +++ b/libs/ypbx/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatepbx.h diff --git a/libs/yrtp/Makefile.in b/libs/yrtp/Makefile.in index 7cc17698..52d2deed 100644 --- a/libs/yrtp/Makefile.in +++ b/libs/yrtp/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatertp.h diff --git a/libs/ysig/Makefile.in b/libs/ysig/Makefile.in index 3a1a0cea..f526c02b 100644 --- a/libs/ysig/Makefile.in +++ b/libs/ysig/Makefile.in @@ -8,7 +8,7 @@ AR := ar DEFS := LIBTHR := @THREAD_LIB@ INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesig.h diff --git a/libs/ysip/Makefile.in b/libs/ysip/Makefile.in index 1600a00f..3ef8e2cf 100644 --- a/libs/ysip/Makefile.in +++ b/libs/ysip/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesip.h @srcdir@/util.h diff --git a/libs/yxml/Makefile.in b/libs/yxml/Makefile.in index 0c44bd63..f41e8c99 100644 --- a/libs/yxml/Makefile.in +++ b/libs/yxml/Makefile.in @@ -7,7 +7,7 @@ CXX := @CXX@ -Wall AR := ar DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L../.. -lyate INCFILES := @top_srcdir@/yateclass.h @srcdir@/tinystr.h @srcdir@/tinyxml.h diff --git a/modules/Makefile.in b/modules/Makefile.in index 76189db3..40f3c8d9 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -13,8 +13,8 @@ MOC := @QT4_MOC@ SED := sed DEFS := INCLUDES := -I.. -I@top_srcdir@ -CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@ -CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@ +CPPFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= @LDFLAGS@ -L.. -lyate MODFLAGS:= @MODULE_LDFLAGS@ MODRELAX:= @MODULE_LDRELAX@