From: John Levon <levon@movementarian.org>
Date: Wed, 29 Aug 2001 19:34:05 +0000 (+0000)
Subject: build fix (hopefully)
X-Git-Tag: 1.6.10~20724
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=37278639f6714cc59aeaf187a63bc86901fba703;p=features.git

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 857a2a0395..1d63652512 100644
--- 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 5487f136da..6f318ce15a 100644
--- 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 9370ae57f3..01dd661de4 100644
--- 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 69c9afaff2..a183d435d3 100644
--- 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 e57788cfe6..4e5012d108 100644
--- 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