From ba837dca09818a6485c5f34a3122199b5ed82c4e Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 14 Dec 2004 10:41:09 +0000 Subject: [PATCH] Remove trailing slash from -Ifoo/ in the AM_CPPFLAGS rules in the various Makefile.ams to overcome bug in the MinGW port of g++ 3.4.2. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9364 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/client/ChangeLog | 5 +++++ src/client/Makefile.am | 2 +- src/frontends/gnome/ChangeLog | 5 +++++ src/frontends/gnome/Makefile.am | 4 ++-- src/frontends/qt2/ChangeLog | 6 ++++++ src/frontends/qt2/Makefile.am | 4 ++-- src/frontends/qt2/moc/Makefile.am | 4 ++-- src/insets/ChangeLog | 4 ++++ src/insets/Makefile.am | 2 +- src/mathed/ChangeLog | 5 +++++ src/mathed/Makefile.am | 2 +- src/support/ChangeLog | 5 +++++ src/support/Makefile.am | 2 +- src/tex2lyx/ChangeLog | 5 +++++ src/tex2lyx/Makefile.am | 2 +- 15 files changed, 46 insertions(+), 11 deletions(-) diff --git a/src/client/ChangeLog b/src/client/ChangeLog index 02067ea1ae..0c9625e2c1 100644 --- a/src/client/ChangeLog +++ b/src/client/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-12-05 Lars Gullik Bjønnes * Makefile.am (BOOST_LIBS): use boost variables diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 8da3e2ac90..84c754b7c4 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -6,7 +6,7 @@ man_MANS = lyxclient.1 bin_PROGRAMS = lyxclient -AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM) diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index e7e0e7c34b..df0d0e9e6d 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-07-24 Lars Gullik Bjonnes * lyx_gui.C: diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 2cd53a6ac6..010cd791ef 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -4,8 +4,8 @@ noinst_LTLIBRARIES = libgnome.la AM_CPPFLAGS = \ $(FRONTEND_INCLUDES) \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/frontends/ \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/xforms \ -I$(top_srcdir)/src/frontends/controllers \ $(BOOST_INCLUDES) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 69983e0873..f53a77e024 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): + * moc/Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-12-05 Lars Gullik Bjønnes * Makefile.am (AM_CPPFLAGS): reformat slightly diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index 2e3823c750..2eff015dfe 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -14,8 +14,8 @@ AM_CPPFLAGS = \ -DQT_CLEAN_NAMESPACE \ -DQT_GENUINE_STR \ $(PCH_FLAGS) \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/frontends/ \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/images \ $(QT_INCLUDES) $(BOOST_INCLUDES) \ -I$(top_srcdir)/src/frontends/controllers diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index f3d039a089..e2f373e0fa 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -5,8 +5,8 @@ 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 \ + -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/controllers \ -I$(top_builddir)/src/frontends/qt2 \ $(QT_INCLUDES) \ diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 5158bdbcd4..77c91da118 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. 2004-12-06 Alfredo Braunstein diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index 982e2bcef7..80b87e08b4 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = \ insettheorem.C \ insettheorem.h -AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libinsets_la_SOURCES = \ mailinset.C \ diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 0bf48b8777..635825daa6 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-11-29 Jean-Marc Lasgouttes * math_charinset.C: use support::contains instead of strchr diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index 63d5a8893f..409a7928d8 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = formulamacro.C noinst_LTLIBRARIES = libmathed.la -AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libmathed_la_SOURCES = \ textpainter.C \ diff --git a/src/support/ChangeLog b/src/support/ChangeLog index f854d807b6..5321f8dda8 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-11-26 Angus Leeming * globbing.[Ch] (glob): change API to: diff --git a/src/support/Makefile.am b/src/support/Makefile.am index ac2127a0e8..2193c1cd8a 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -12,7 +12,7 @@ endif BUILT_SOURCES = path_defines.C -AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libsupport_la_SOURCES = \ FileInfo.C \ diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog index 85a53893c5..289555ab85 100644 --- a/src/tex2lyx/ChangeLog +++ b/src/tex2lyx/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Angus Leeming + + * Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/ + to overcome bug in the MinGW port of g++ 3.4.2. + 2004-12-05 Lars Gullik Bjønnes * Makefile.am (tex2lyx_LDADD): use boost variables diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 1939e59cfb..4871a21123 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -13,7 +13,7 @@ DISTCLEANFILES += $(BUILT_SOURCES) bin_PROGRAMS = tex2lyx -AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) +AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) BUILT_SOURCES = \ FloatList.C \ -- 2.39.2