anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the setting of the Qt preprocessor flags out of the Makefiles and into qt.m4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9855 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-22 10:59:17 +00:00
parent 78d4f289a0
commit f8ca518f31
7 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-22 Angus Leeming <leeming@lyx.org>
* qt.m4: Move the Qt-specific preprocessor flags out of the
various Makefile.am files to here. Specialise the flags for mingw.
2005-02-17 Michael Schmitt <michael.schmitt@teststep.org>
* qt.m4: detect Qt Win/Free library

7
config/qt.m4
View File

@ -199,6 +199,13 @@ AC_DEFUN([QT_DO_IT_ALL],
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
dnl Preprocessor flags
case ${host} in
*mingw*) QT_CPPFLAGS="-DQT_DLL -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
*) QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
esac
AC_SUBST(QT_CPPFLAGS)
if test -z "$MOC"; then
QT_FIND_MOC
MOC=$ac_moc

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,11 @@
2005-04-22 Angus Leeming <leeming@lyx.org>
* Makefile.am:
* moc/Makefile.am:
* ui/Makefile.am:
* ui/moc/Makefile.am: Move the Qt-specific preprocessor flags out of
the various Makefile.am files to config/qt.m4.
2005-04-15 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* ui/QPrefsConvertersModule.ui:

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

@ -11,8 +11,7 @@ libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR \
$(QT_CPPFLAGS) \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \

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

@ -3,7 +3,8 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
AM_CPPFLAGS = \
$(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \

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

@ -8,9 +8,7 @@ SUBDIRS = . moc
EXTRA_DIST = QPreambleDialogBase.ui $(UIFILES)
AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR \
-DQT_NO_TRANSLATION \
$(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \

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

@ -3,7 +3,8 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
AM_CPPFLAGS = \
$(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \