From: Lars Gullik Bjønnes Date: Sat, 4 Dec 2004 14:50:25 +0000 (+0000) Subject: more PCH_FLAGS work X-Git-Tag: 1.6.10~14761 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a4319c2b892dae252e31d5d57d04927d0580597e;p=lyx.git more PCH_FLAGS work git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9341 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/ChangeLog b/ChangeLog index f7660fafe1..d2f585de5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2004-12-04 Lars Gullik Bjonnes + + * Most Makefile.am's: Move PCH_FLAGS to AM_CPP flags where + possible. + 2004-12-03 Lars Gullik Bjonnes * Most Makefile.am's: Change to use AM_CPPFLAGS instead of - INCLUDES since that has been deprecated by automake. + INCLUDES since that has been deprecated by automake. 2004-11-25 Angus Leeming diff --git a/boost/ChangeLog b/boost/ChangeLog index 01711ce0c1..7230853128 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,8 @@ +2004-12-04 Lars Gullik Bjonnes + + * boost/config/compiler/gcc.hpp: all to compile with gcc 4.0 + without warnings. + 2004-11-24 Lars Gullik Bjønnes * add spirit to the collection diff --git a/boost/boost/config/compiler/gcc.hpp b/boost/boost/config/compiler/gcc.hpp index 4dc3f608bc..328f139726 100644 --- a/boost/boost/config/compiler/gcc.hpp +++ b/boost/boost/config/compiler/gcc.hpp @@ -85,7 +85,7 @@ #endif // // last known and checked version is 3.4: -#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4)) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 0)) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/boost/libs/filesystem/Makefile.am b/boost/libs/filesystem/Makefile.am index c677165dc7..e27a6d8d7d 100644 --- a/boost/libs/filesystem/Makefile.am +++ b/boost/libs/filesystem/Makefile.am @@ -1,4 +1,3 @@ include $(top_srcdir)/config/common.am SUBDIRS = src - diff --git a/boost/libs/filesystem/src/Makefile.am b/boost/libs/filesystem/src/Makefile.am index cc492d6b7a..6aaab5fe5b 100644 --- a/boost/libs/filesystem/src/Makefile.am +++ b/boost/libs/filesystem/src/Makefile.am @@ -3,11 +3,10 @@ include $(top_srcdir)/config/common.am noinst_LTLIBRARIES = libboostfilesystem.la AM_CPPFLAGS = \ + $(PCH_FLAGS) \ -DBOOST_USER_CONFIG="" \ $(BOOST_INCLUDES) -AM_CXXFLAGS = $(PCH_FLAGS) - libboostfilesystem_la_SOURCES = \ convenience.cpp \ exception.cpp \ diff --git a/boost/libs/regex/src/Makefile.am b/boost/libs/regex/src/Makefile.am index e81eb13243..eac7882567 100644 --- a/boost/libs/regex/src/Makefile.am +++ b/boost/libs/regex/src/Makefile.am @@ -3,11 +3,10 @@ include $(top_srcdir)/config/common.am noinst_LTLIBRARIES = libboostregex.la AM_CPPFLAGS = \ + $(PCH_FLAGS) \ -DBOOST_USER_CONFIG="" \ $(BOOST_INCLUDES) -AM_CXXFLAGS = $(PCH_FLAGS) - libboostregex_la_SOURCES = \ cpp_regex_traits.cpp \ c_regex_traits_common.cpp \ diff --git a/boost/libs/signals/Makefile.am b/boost/libs/signals/Makefile.am index c677165dc7..e27a6d8d7d 100644 --- a/boost/libs/signals/Makefile.am +++ b/boost/libs/signals/Makefile.am @@ -1,4 +1,3 @@ include $(top_srcdir)/config/common.am SUBDIRS = src - diff --git a/boost/libs/signals/src/Makefile.am b/boost/libs/signals/src/Makefile.am index 788506f362..85840e8eb5 100644 --- a/boost/libs/signals/src/Makefile.am +++ b/boost/libs/signals/src/Makefile.am @@ -3,11 +3,10 @@ include $(top_srcdir)/config/common.am noinst_LTLIBRARIES = libboostsignals.la AM_CPPFLAGS = \ + $(PCH_FLAGS) \ -DBOOST_USER_CONFIG="" \ $(BOOST_INCLUDES) -AM_CXXFLAGS = $(PCH_FLAGS) - libboostsignals_la_SOURCES = \ connection.cpp \ named_slot_map.cpp \ diff --git a/config/ChangeLog b/config/ChangeLog index 4ae2b9184f..fa0292368b 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,5 +1,7 @@ 2004-12-04 Lars Gullik Bjonnes + * lyxinclude.m4 (lyx_pch_comp): next gcc version is 4.0 not 3.5 + * common.am ($(PCH_FILE)): do a subst and sed dance to get rid of the PCH_FLAGS from the command line when generating the precompiled header. diff --git a/src/Makefile.am b/src/Makefile.am index 275246adbf..2601365faf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,9 +54,7 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS) BUILT_SOURCES = version.C -AM_CPPFLAGS = $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES) lyx_SOURCES = \ Bidi.C \ diff --git a/src/client/Makefile.am b/src/client/Makefile.am index d6b44b525d..8b0767282c 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -6,9 +6,7 @@ man_MANS = lyxclient.1 bin_PROGRAMS = lyxclient -AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) if USE_INCLUDED_BOOST BOOST_LIBS = $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \ diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 1bb0a9380e..74d2f42f27 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -6,9 +6,7 @@ DIST_SUBDIRS = controllers xforms qt2 gnome gtk noinst_LTLIBRARIES = libfrontends.la -AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libfrontends_la_SOURCES = \ Alert.C \ diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 8ee75ed0c0..17d23becfe 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -4,9 +4,7 @@ EXTRA_DIST = BCView.tmpl noinst_LTLIBRARIES = libcontrollers.la -AM_CPPFLAGS = -I$(top_srcdir)/src $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) libcontrollers_la_SOURCES= \ Dialog.C \ diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index 7c72b1c22d..5c4b676b25 100644 --- a/src/frontends/gtk/Makefile.am +++ b/src/frontends/gtk/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = gimages glade noinst_LTLIBRARIES = libgtk.la AM_CPPFLAGS = \ + $(PCH_FLAGS) \ -I$(top_srcdir)/images \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends \ diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index ccfb657559..eb7e95a2e0 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -13,13 +13,12 @@ libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo AM_CPPFLAGS = \ -DQT_CLEAN_NAMESPACE \ -DQT_GENUINE_STR \ + $(PCH_FLAGS) \ -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ -I$(top_srcdir)/images \ $(QT_INCLUDES) $(BOOST_INCLUDES) \ -I$(top_srcdir)/src/frontends/controllers -AM_CXXFLAGS = $(PCH_FLAGS) - libqt2_la_SOURCES = \ QDialogView.C \ QDialogView.h \ diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index 5a4b0275c8..f3d039a089 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -4,6 +4,7 @@ include $(srcdir)/../Makefile.dialogs DISTCLEANFILES += *.C AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \ + $(PCH_FLAGS) \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/frontends/ \ -I$(top_srcdir)/src/frontends/controllers \ @@ -11,8 +12,6 @@ AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \ $(QT_INCLUDES) \ $(BOOST_INCLUDES) -AM_CXXFLAGS = $(PCH_FLAGS) - noinst_LTLIBRARIES = libqt2moc.la nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C) diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index b3c5e1f6c1..4c041e0dc4 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -11,14 +11,13 @@ AM_CPPFLAGS = \ -DQT_CLEAN_NAMESPACE \ -DQT_GENUINE_STR \ -DQT_NO_TRANSLATION \ + $(PCH_FLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/qt2 \ $(QT_INCLUDES) $(BOOST_INCLUDES) \ -I$(top_srcdir)/src/frontends/controllers -AM_CXXFLAGS = $(PCH_FLAGS) - noinst_LTLIBRARIES = libqt2ui.la nodist_libqt2ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C) diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am index ec389e24d2..f55e417187 100644 --- a/src/frontends/qt2/ui/moc/Makefile.am +++ b/src/frontends/qt2/ui/moc/Makefile.am @@ -4,14 +4,13 @@ include $(srcdir)/../../Makefile.dialogs DISTCLEANFILES += $(UIFILES:.ui=_moc.C) AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \ + $(PCH_FLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/controllers \ $(QT_INCLUDES) \ $(BOOST_INCLUDES) -AM_CXXFLAGS = $(PCH_FLAGS) - noinst_LTLIBRARIES = libqt2uimoc.la nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C) diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index c27cb3e0ee..c4ff090716 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -14,6 +14,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/frontends/controllers \ $(BOOST_INCLUDES) +# This cannot be put in AM_CPPFLAGS since that is used both for C and C++ +# And the precompiled header is setup only for C++ AM_CXXFLAGS = $(PCH_FLAGS) noinst_LTLIBRARIES = libxforms.la diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index dc832f6541..3d1419cddf 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -5,9 +5,7 @@ DISTCLEANFILES += $(SRCS:.fd=.C) $(SRCS:.fd=.h) $(SRCS:.fd=.c) EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS) # For (forms_fwd.h, forms_gettext.h) and support/std_string.h, respectively. -AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/src -I.. - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. -I$(top_srcdir)/src -I.. noinst_LTLIBRARIES = libfdesign.la diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am index b1c792c48d..0891b93b3f 100644 --- a/src/graphics/Makefile.am +++ b/src/graphics/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/config/common.am noinst_LTLIBRARIES = libgraphics.la -AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libgraphics_la_SOURCES = \ GraphicsCache.h \ diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index ea26eb75cd..982e2bcef7 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -6,9 +6,7 @@ EXTRA_DIST = \ insettheorem.C \ insettheorem.h -AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) libinsets_la_SOURCES = \ mailinset.C \ diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index 73d1b3053c..63d5a8893f 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -4,9 +4,7 @@ EXTRA_DIST = formulamacro.C noinst_LTLIBRARIES = libmathed.la -AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) libmathed_la_SOURCES = \ textpainter.C \ diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 4c4431faaf..ac2127a0e8 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -12,9 +12,7 @@ endif BUILT_SOURCES = path_defines.C -AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) libsupport_la_SOURCES = \ FileInfo.C \ diff --git a/src/support/forkedcontr.C b/src/support/forkedcontr.C index c4ab4371ac..77b3f615d6 100644 --- a/src/support/forkedcontr.C +++ b/src/support/forkedcontr.C @@ -20,7 +20,6 @@ #include "debug.h" #include -#include #include #include diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 8f962e5178..1e84ba2774 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -13,9 +13,7 @@ DISTCLEANFILES += $(BUILT_SOURCES) bin_PROGRAMS = tex2lyx -AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(PCH_FLAGS) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) BUILT_SOURCES = \ FloatList.C \