Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/settings.pro,v
retrieving revision 1.109
diff -r1.109 settings.pro
25,28c25,27
< QMAKE_CXXFLAGS += $$ARCHFLAGS
< QMAKE_CXXFLAGS += $$CONFIG_AUDIO_ARTS_CFLAGS
< QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
< QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
---
> QMAKE_CFLAGS += $$ARCHFLAGS $$OPTFLAGS
> QMAKE_CFLAGS_RELEASE += -fomit-frame-pointer
> QMAKE_CFLAGS_RELEASE += $$PROFILEFLAGS
32d30
< QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS -fomit-frame-pointer
34c32
<     QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS
---
>     QMAKE_CFLAGS_RELEASE = $$OPTFLAGS
38d35
< QMAKE_CXXFLAGS_RELEASE += $$PROFILEFLAGS
40,42c37,45
< QMAKE_CFLAGS += $$ARCHFLAGS
< QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
< QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
---
> QMAKE_CXXFLAGS += $${QMAKE_CFLAGS} $$OPTCXXFLAGS
> QMAKE_CXXFLAGS += $$CONFIG_AUDIO_ARTS_CFLAGS
> QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
> QMAKE_CFLAGS_SHLIB += -DPIC -fPIC
> 
> 
> QMAKE_CXXFLAGS_RELEASE += $${QMAKE_CFLAGS_RELEASE}
> QMAKE_CXXFLAGS_DEBUG += $${QMAKE_CFLAGS_DEBUG}
> QMAKE_CXXFLAGS_SHLIB = $${QMAKE_CFLAGS_SHLIB}