anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build fix (hopefully)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2621 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2001-08-29 19:34:05 +00:00
parent f1e2433313
commit 37278639f6
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt2/ChangeLog
View File

@ -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.

2
src/frontends/qt2/Makefile.am
View File

@ -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

1
src/frontends/qt2/moc/Makefile.am
View File

@ -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

2
src/frontends/qt2/ui/Makefile.am
View File

@ -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

1
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -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