Have a look. This works fine for me.
Index: boost/libs/filesystem/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/filesystem/src/Makefile.am,v
retrieving revision 1.4
diff -u -p -B -b -w -r1.4 Makefile.am
--- boost/libs/filesystem/src/Makefile.am 3 Dec 2004 19:11:35 -0000 1.4
+++ boost/libs/filesystem/src/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -3,10 +3,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostfilesystem.la
AM_CPPFLAGS = \
+ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(PCH_FLAGS)
libboostfilesystem_la_SOURCES = \
convenience.cpp \
Index: boost/libs/regex/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/Makefile.am,v
retrieving revision 1.10
diff -u -p -B -b -w -r1.10 Makefile.am
--- boost/libs/regex/src/Makefile.am 3 Dec 2004 19:11:35 -0000 1.10
+++ boost/libs/regex/src/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -3,10 +3,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostregex.la
AM_CPPFLAGS = \
+ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(PCH_FLAGS)
libboostregex_la_SOURCES = \
cpp_regex_traits.cpp \
Index: boost/libs/signals/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/signals/src/Makefile.am,v
retrieving revision 1.5
diff -u -p -B -b -w -r1.5 Makefile.am
--- boost/libs/signals/src/Makefile.am 3 Dec 2004 19:11:35 -0000 1.5
+++ boost/libs/signals/src/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -3,10 +3,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostsignals.la
AM_CPPFLAGS = \
+ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(PCH_FLAGS)
libboostsignals_la_SOURCES = \
connection.cpp \
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.220
diff -u -p -B -b -w -r1.220 Makefile.am
--- src/Makefile.am 3 Dec 2004 19:11:35 -0000 1.220
+++ src/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/client/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/Makefile.am,v
retrieving revision 1.5
diff -u -p -B -b -w -r1.5 Makefile.am
--- src/client/Makefile.am 3 Dec 2004 19:11:36 -0000 1.5
+++ src/client/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.63
diff -u -p -B -b -w -r1.63 Makefile.am
--- src/frontends/Makefile.am 3 Dec 2004 19:11:36 -0000 1.63
+++ src/frontends/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -6,9 +6,7 @@ DIST_SUBDIRS = controllers xforms qt2 gn
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 \
Index: src/frontends/controllers/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/Makefile.am,v
retrieving revision 1.69
diff -u -p -B -b -w -r1.69 Makefile.am
--- src/frontends/controllers/Makefile.am 3 Dec 2004 19:11:36 -0000 1.69
+++ src/frontends/controllers/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/frontends/gtk/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/Makefile.am,v
retrieving revision 1.36
diff -u -p -B -b -w -r1.36 Makefile.am
--- src/frontends/gtk/Makefile.am 3 Dec 2004 19:11:36 -0000 1.36
+++ src/frontends/gtk/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.98
diff -u -p -B -b -w -r1.98 Makefile.am
--- src/frontends/qt2/Makefile.am 3 Dec 2004 19:56:32 -0000 1.98
+++ src/frontends/qt2/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -13,12 +13,11 @@ libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc
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 \
Index: src/frontends/qt2/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/moc/Makefile.am,v
retrieving revision 1.28
diff -u -p -B -b -w -r1.28 Makefile.am
--- src/frontends/qt2/moc/Makefile.am 3 Dec 2004 19:11:36 -0000 1.28
+++ src/frontends/qt2/moc/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -4,14 +4,13 @@ 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 \
-I$(top_builddir)/src/frontends/qt2 \
$(QT_INCLUDES) \
$(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libqt2moc.la
Index: src/frontends/qt2/ui/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/Makefile.am,v
retrieving revision 1.26
diff -u -p -B -b -w -r1.26 Makefile.am
--- src/frontends/qt2/ui/Makefile.am 3 Dec 2004 19:56:32 -0000 1.26
+++ src/frontends/qt2/ui/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -11,13 +11,12 @@ 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
Index: src/frontends/qt2/ui/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/moc/Makefile.am,v
retrieving revision 1.18
diff -u -p -B -b -w -r1.18 Makefile.am
--- src/frontends/qt2/ui/moc/Makefile.am 3 Dec 2004 19:11:37 -0000 1.18
+++ src/frontends/qt2/ui/moc/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -4,13 +4,12 @@ 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
Index: src/frontends/xforms/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.121
diff -u -p -B -b -w -r1.121 Makefile.am
--- src/frontends/xforms/Makefile.am 3 Dec 2004 19:11:37 -0000 1.121
+++ src/frontends/xforms/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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
Index: src/frontends/xforms/forms/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/Makefile.am,v
retrieving revision 1.37
diff -u -p -B -b -w -r1.37 Makefile.am
--- src/frontends/xforms/forms/Makefile.am 3 Dec 2004 19:11:37 -0000 1.37
+++ src/frontends/xforms/forms/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -5,9 +5,7 @@ DISTCLEANFILES += $(SRCS:.fd=.C) $(SRCS:
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
Index: src/graphics/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Makefile.am,v
retrieving revision 1.31
diff -u -p -B -b -w -r1.31 Makefile.am
--- src/graphics/Makefile.am 3 Dec 2004 19:11:37 -0000 1.31
+++ src/graphics/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/insets/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/Makefile.am,v
retrieving revision 1.80
diff -u -p -B -b -w -r1.80 Makefile.am
--- src/insets/Makefile.am 3 Dec 2004 19:11:37 -0000 1.80
+++ src/insets/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/mathed/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Makefile.am,v
retrieving revision 1.138
diff -u -p -B -b -w -r1.138 Makefile.am
--- src/mathed/Makefile.am 3 Dec 2004 19:11:37 -0000 1.138
+++ src/mathed/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.81
diff -u -p -B -b -w -r1.81 Makefile.am
--- src/support/Makefile.am 3 Dec 2004 19:11:38 -0000 1.81
+++ src/support/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
Index: src/tex2lyx/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/Makefile.am,v
retrieving revision 1.19
diff -u -p -B -b -w -r1.19 Makefile.am
--- src/tex2lyx/Makefile.am 3 Dec 2004 19:11:38 -0000 1.19
+++ src/tex2lyx/Makefile.am 4 Dec 2004 13:48:44 -0000
@@ -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 \
--
Lgb
