Re: [Patch] Use AM_CPPFLAGS for PCH_FLAGS wereever possible.

2004-12-05 Thread Angus Leeming
Lars Gullik Bjønnes wrote:

> Have a look. This works fine for me.

Looks nice. I'll try too soon...

-- 
Angus



[Patch] Use AM_CPPFLAGS for PCH_FLAGS wereever possible.

2004-12-04 Thread Lars Gullik Bjønnes

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 -	1.4
+++ boost/libs/filesystem/src/Makefile.am	4 Dec 2004 13:48:44 -
@@ -3,10 +3,9 @@ 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 \
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 -	1.10
+++ boost/libs/regex/src/Makefile.am	4 Dec 2004 13:48:44 -
@@ -3,10 +3,9 @@ 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 \
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 -	1.5
+++ boost/libs/signals/src/Makefile.am	4 Dec 2004 13:48:44 -
@@ -3,10 +3,9 @@ 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 \
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 -	1.220
+++ src/Makefile.am	4 Dec 2004 13:48:44 -
@@ -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 -	1.5
+++ src/client/Makefile.am	4 Dec 2004 13:48:44 -
@@ -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 -	1.63
+++ src/frontends/Makefile.am	4 Dec 2004 13:48:44 -
@@ -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 -	1.69
+++ src/frontends/controllers/Makefile.am	4 Dec 2004 13:48:44 -
@@ -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 -	1.36
+++ src/frontends/gtk/Makefile.am	4 Dec 2004 13:48:44 -
@@ -5,6 +5,7 @@ SUBDIRS = gimages glade
 noinst_LTLIBRARIES = libgtk.la
 
 AM_CPPFLAGS = \
+	$(PCH_FLAGS) \
 	-I$(top_srcd