[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes:
>>> Also I read from the automake documentation that "INCLUDES" is
>>> deperecated and that AM_CPPFLAGS should be used in stead.
>>
| | But is that true for all versions of automake that we say we support?
>
| That AM_CPPFLAGS is supported? I belive so, yes.
And this patch does the change. (no pch work yet.)
? Config
? idxupdown2-1.diff
? includes-1.diff
? lib/help
? src/mathed/ref_inset.loT
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.3
diff -u -p -B -b -w -r1.3 Makefile.am
--- boost/libs/filesystem/src/Makefile.am 18 Aug 2004 14:20:15 -0000 1.3
+++ boost/libs/filesystem/src/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostfilesystem.la
-INCLUDES = $(BOOST_INCLUDES)
+AM_CPPFLAGS = \
+ -DBOOST_USER_CONFIG="<config.h>" \
+ $(BOOST_INCLUDES)
-AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostfilesystem_la_SOURCES = \
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.9
diff -u -p -B -b -w -r1.9 Makefile.am
--- boost/libs/regex/src/Makefile.am 18 Aug 2004 14:20:16 -0000 1.9
+++ boost/libs/regex/src/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostregex.la
-INCLUDES = $(BOOST_INCLUDES)
+AM_CPPFLAGS = \
+ -DBOOST_USER_CONFIG="<config.h>" \
+ $(BOOST_INCLUDES)
-AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostregex_la_SOURCES = \
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.4
diff -u -p -B -b -w -r1.4 Makefile.am
--- boost/libs/signals/src/Makefile.am 20 Nov 2004 09:08:45 -0000 1.4
+++ boost/libs/signals/src/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostsignals.la
-INCLUDES = $(BOOST_INCLUDES)
+AM_CPPFLAGS = \
+ -DBOOST_USER_CONFIG="<config.h>" \
+ $(BOOST_INCLUDES)
-AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostsignals_la_SOURCES = \
Index: config/common.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/common.am,v
retrieving revision 1.10
diff -u -p -B -b -w -r1.10 common.am
--- config/common.am 29 Aug 2004 23:52:47 -0000 1.10
+++ config/common.am 3 Dec 2004 17:00:16 -0000
@@ -19,7 +19,7 @@ sinclude ./pch.h.gch.dep
*.C *.cpp: $(PCH_FILE)
pch.h.gch: $(PCH_SOURCE)
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) \
-x c++-header $(PCH_SOURCE) -MT $@ -MD -MP -MF "./[EMAIL PROTECTED]" \
&& mv "./[EMAIL PROTECTED]" "./[EMAIL PROTECTED]" || rm "./[EMAIL PROTECTED]"
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.219
diff -u -p -B -b -w -r1.219 Makefile.am
--- src/Makefile.am 30 Nov 2004 09:21:11 -0000 1.219
+++ src/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -52,9 +52,9 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
#lyx_LDFLAGS=-Wl,-O1
-INCLUDES = $(BOOST_INCLUDES)
-
BUILT_SOURCES = version.C
+
+AM_CPPFLAGS = $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/client/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/Makefile.am,v
retrieving revision 1.4
diff -u -p -B -b -w -r1.4 Makefile.am
--- src/client/Makefile.am 26 Oct 2004 21:16:43 -0000 1.4
+++ src/client/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -6,7 +6,7 @@ man_MANS = lyxclient.1
bin_PROGRAMS = lyxclient
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.62
diff -u -p -B -b -w -r1.62 Makefile.am
--- src/frontends/Makefile.am 18 Aug 2004 14:20:16 -0000 1.62
+++ src/frontends/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -6,7 +6,7 @@ DIST_SUBDIRS = controllers xforms qt2 gn
noinst_LTLIBRARIES = libfrontends.la
-INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/frontends/controllers/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/Makefile.am,v
retrieving revision 1.68
diff -u -p -B -b -w -r1.68 Makefile.am
--- src/frontends/controllers/Makefile.am 18 Aug 2004 14:20:17 -0000 1.68
+++ src/frontends/controllers/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,9 +2,9 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = BCView.tmpl
-INCLUDES = -I$(top_srcdir)/src $(BOOST_INCLUDES)
-
noinst_LTLIBRARIES = libcontrollers.la
+
+AM_CPPFLAGS = -I$(top_srcdir)/src $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/frontends/gnome/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/Makefile.am,v
retrieving revision 1.51
diff -u -p -B -b -w -r1.51 Makefile.am
--- src/frontends/gnome/Makefile.am 28 May 2004 07:14:57 -0000 1.51
+++ src/frontends/gnome/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgnome.la
-INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \
+AM_CPPFLAGS = \
+ $(FRONTEND_INCLUDES) \
+ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/xforms \
-I$(top_srcdir)/src/frontends/controllers \
Index: src/frontends/gtk/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/Makefile.am,v
retrieving revision 1.35
diff -u -p -B -b -w -r1.35 Makefile.am
--- src/frontends/gtk/Makefile.am 21 Nov 2004 13:13:41 -0000 1.35
+++ src/frontends/gtk/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -4,7 +4,9 @@ SUBDIRS = gimages glade
noinst_LTLIBRARIES = libgtk.la
-INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/images \
+ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
-I../xforms \
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.96
diff -u -p -B -b -w -r1.96 Makefile.am
--- src/frontends/qt2/Makefile.am 18 Aug 2004 14:20:17 -0000 1.96
+++ src/frontends/qt2/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -5,17 +5,19 @@ SUBDIRS = ui moc
EXTRA_DIST = Makefile.dialogs
-INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
- -I$(top_srcdir)/images \
- $(QT_INCLUDES) $(BOOST_INCLUDES) \
- -I$(top_srcdir)/src/frontends/controllers
-
noinst_LTLIBRARIES = libqt2.la
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
+AM_CPPFLAGS = \
+ -DQT_CLEAN_NAMESPACE \
+ -DQT_GENUINE_STR
+ -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 = \
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.27
diff -u -p -B -b -w -r1.27 Makefile.am
--- src/frontends/qt2/moc/Makefile.am 18 Aug 2004 15:59:50 -0000 1.27
+++ src/frontends/qt2/moc/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -3,14 +3,14 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
-INCLUDES = -I$(top_srcdir)/src/ \
+AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
+ -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_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
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.24
diff -u -p -B -b -w -r1.24 Makefile.am
--- src/frontends/qt2/ui/Makefile.am 18 Aug 2004 15:59:50 -0000 1.24
+++ src/frontends/qt2/ui/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -7,12 +7,16 @@ SUBDIRS = . moc
EXTRA_DIST = QPreambleDialogBase.ui $(UIFILES)
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
+AM_CPPFLAGS = \
+ -DQT_CLEAN_NAMESPACE \
+ -DQT_GENUINE_STR \
+ -DQT_NO_TRANSLATION
+ -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_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
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.17
diff -u -p -B -b -w -r1.17 Makefile.am
--- src/frontends/qt2/ui/moc/Makefile.am 18 Aug 2004 15:59:50 -0000 1.17
+++ src/frontends/qt2/ui/moc/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -3,13 +3,13 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
-INCLUDES = -I$(top_srcdir)/src \
+AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
+ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
$(QT_INCLUDES) \
$(BOOST_INCLUDES)
-AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
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.120
diff -u -p -B -b -w -r1.120 Makefile.am
--- src/frontends/xforms/Makefile.am 18 Aug 2004 14:20:17 -0000 1.120
+++ src/frontends/xforms/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -7,7 +7,9 @@ BUILT_SOURCES = lyx_forms.h lyx_xpm.h
EXTRA_DIST = lyx_forms.h.in lyx_xpm.h.in
-INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/images \
+ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
$(BOOST_INCLUDES)
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.36
diff -u -p -B -b -w -r1.36 Makefile.am
--- src/frontends/xforms/forms/Makefile.am 8 Nov 2004 10:56:02 -0000 1.36
+++ src/frontends/xforms/forms/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -5,7 +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.
-INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/src -I..
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/src -I..
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/graphics/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Makefile.am,v
retrieving revision 1.30
diff -u -p -B -b -w -r1.30 Makefile.am
--- src/graphics/Makefile.am 18 Aug 2004 14:20:17 -0000 1.30
+++ src/graphics/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgraphics.la
-INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/insets/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/Makefile.am,v
retrieving revision 1.79
diff -u -p -B -b -w -r1.79 Makefile.am
--- src/insets/Makefile.am 18 Aug 2004 14:20:17 -0000 1.79
+++ src/insets/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -2,11 +2,11 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libinsets.la
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
-
EXTRA_DIST = \
insettheorem.C \
insettheorem.h
+
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/mathed/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Makefile.am,v
retrieving revision 1.137
diff -u -p -B -b -w -r1.137 Makefile.am
--- src/mathed/Makefile.am 30 Nov 2004 01:59:49 -0000 1.137
+++ src/mathed/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -4,7 +4,7 @@ EXTRA_DIST = formulamacro.C
noinst_LTLIBRARIES = libmathed.la
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.80
diff -u -p -B -b -w -r1.80 Makefile.am
--- src/support/Makefile.am 25 Nov 2004 11:08:32 -0000 1.80
+++ src/support/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -4,8 +4,6 @@ noinst_LTLIBRARIES = libsupport.la
CLEANFILES += path_defines.C
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
-
EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
if USE_COMPRESSION
@@ -13,6 +11,8 @@ COMPRESSION = gzstream.C gzstream.h
endif
BUILT_SOURCES = path_defines.C
+
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
Index: src/tex2lyx/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/Makefile.am,v
retrieving revision 1.18
diff -u -p -B -b -w -r1.18 Makefile.am
--- src/tex2lyx/Makefile.am 18 Aug 2004 14:20:18 -0000 1.18
+++ src/tex2lyx/Makefile.am 3 Dec 2004 17:00:16 -0000
@@ -1,6 +1,5 @@
include $(top_srcdir)/config/common.am
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
EXTRA_DIST = test-structure.tex test-insets.tex
DISTCLEANFILES += $(BUILT_SOURCES)
@@ -13,6 +12,8 @@ DISTCLEANFILES += $(BUILT_SOURCES)
#tex2lyx_LDADD = libtexparser.la
bin_PROGRAMS = tex2lyx
+
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
--
Lgb
