build fix (hopefully)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2621 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 857a2a039540b9ae1a85d3a9d992384a68f6e708..1d636525121516f24eb851168bd6aa129bcc1fe8 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-29  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Makefile.am:
+       * moc/Makefile.am:
+       * ui/Makefile.am:
+       * ui/moc/Makefile.am: use AM_CXXFLAGS to add defines
+
 2001-08-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * QAbout.C: added a using std::getline directive.

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 5487f136da54ccb3242940947304df5557da80f2..6f318ce15a254edcc959b6f717f3b832075df5a1 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS=ui moc
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
        ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
-CXXFLAGS += -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index 9370ae57f3fd949c38b4007accd367006b61850d..01dd661de40daa5331a5c04f4ba125eb3bb8bf73 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = -I${top_srcdir}/src/ \
        ${SIGC_CFLAGS} \
        ${FRONTEND_INCLUDES} \
        $(BOOST_INCLUDES)
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include ../Makefile.dialogs
 

diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am
index 69c9afaff2318cd1aaa3decce0d9dca8326b1989..a183d435d3c16a93e097ead51b880740ea66be82 100644 (file)
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt2/ui/Makefile.am
@@ -6,7 +6,7 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ -I$(top_srcdir)/src/frontends/qt2/ \
        ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
-DEFINES += -DQT_CLEAN_NAMESPACE
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 ETAGS_ARGS = --lang=c++
 SUBDIRS=. moc
 

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index e57788cfe63f349e5f1a448fa3f35c21a88e6a91..4e5012d108ec973fad9ae7035db3d2d61f60dfdc 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES = -I${top_srcdir}/src/ \
        ${SIGC_CFLAGS} \
        ${FRONTEND_INCLUDES} \
        $(BOOST_INCLUDES)
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include ../../Makefile.dialogs