[Gnash-commit] gnash ChangeLog gui/am-frag/qtopia.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/29 07:22:37

Modified files:
        .              : ChangeLog 
        gui/am-frag    : qtopia.am 

Log message:
        don't append to CXXFLAGS before it's set.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5008&r2=1.5009
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/qtopia.am?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5008
retrieving revision 1.5009
diff -u -b -r1.5008 -r1.5009
--- ChangeLog   29 Nov 2007 03:47:05 -0000      1.5008
+++ ChangeLog   29 Nov 2007 07:22:35 -0000      1.5009
@@ -1,3 +1,8 @@
+2007-11-29 Sandro Santilli <address@hidden>
+
+       * gui/am-frag/qtopia.am: don't append to CXXFLAGS before it's
+         set.
+
 2007-11-28  Rob Savoye  <address@hidden>
 
        * configure.ac: Remove duplicate AC_DEFINE of HAVE_QTOPIA.

Index: gui/am-frag/qtopia.am
===================================================================
RCS file: /sources/gnash/gnash/gui/am-frag/qtopia.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gui/am-frag/qtopia.am       29 Nov 2007 03:47:06 -0000      1.2
+++ gui/am-frag/qtopia.am       29 Nov 2007 07:22:36 -0000      1.3
@@ -3,11 +3,11 @@
 # 
 if BUILD_QTOPIA_GUI
 bin_PROGRAMS += qtopia-gnash
+qtopia_gnash_CPPFLAGS = -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
+        $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
 if HAVE_QTOPIA_2
-qtopia_gnash_CPPFLAGS = -DQT_QWS_IPAQ -DQWS
+qtopia_gnash_CPPFLAGS += -DQT_QWS_IPAQ -DQWS
 endif
-qtopia_gnash_CPPFLAGS += -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
-        $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
 qtopia_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
 qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
 #qtopia_gnash_DEPENDENCIES = .configline