anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more PCH_FLAGS work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9341 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-12-04 14:50:25 +00:00
parent eb513cccee
commit a4319c2b89
26 changed files with 34 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,7 +1,12 @@
2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net>
* Most Makefile.am's: Move PCH_FLAGS to AM_CPP flags where
possible.
2004-12-03 Lars Gullik Bjonnes <larsbj@gullik.net>
* 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 <leeming@lyx.org>

5
boost/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net>
* boost/config/compiler/gcc.hpp: all to compile with gcc 4.0
without warnings.
2004-11-24 Lars Gullik Bjønnes <larsbj@gullik.net>
* add spirit to the collection

2
boost/boost/config/compiler/gcc.hpp
View File

@ -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

1
boost/libs/filesystem/Makefile.am
View File

@ -1,4 +1,3 @@
include $(top_srcdir)/config/common.am
SUBDIRS = src

3
boost/libs/filesystem/src/Makefile.am
View File

@ -3,11 +3,10 @@ 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 \
exception.cpp \

3
boost/libs/regex/src/Makefile.am
View File

@ -3,11 +3,10 @@ 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 \
c_regex_traits_common.cpp \

1
boost/libs/signals/Makefile.am
View File

@ -1,4 +1,3 @@
include $(top_srcdir)/config/common.am
SUBDIRS = src

3
boost/libs/signals/src/Makefile.am
View File

@ -3,11 +3,10 @@ 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 \
named_slot_map.cpp \

2
config/ChangeLog
View File

@ -1,5 +1,7 @@
2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net>
* 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.

4
src/Makefile.am
View File

@ -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 \

4
src/client/Makefile.am
View File

@ -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 \

4
src/frontends/Makefile.am
View File

@ -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 \

4
src/frontends/controllers/Makefile.am
View File

@ -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 \

1
src/frontends/gtk/Makefile.am
View File

@ -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 \

3
src/frontends/qt2/Makefile.am
View File

@ -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 \

3
src/frontends/qt2/moc/Makefile.am
View File

@ -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)

3
src/frontends/qt2/ui/Makefile.am
View File

@ -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)

3
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -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)

2
src/frontends/xforms/Makefile.am
View File

@ -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

4
src/frontends/xforms/forms/Makefile.am
View File

@ -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

4
src/graphics/Makefile.am
View File

@ -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 \

4
src/insets/Makefile.am
View File

@ -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 \

4
src/mathed/Makefile.am
View File

@ -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 \

4
src/support/Makefile.am
View File

@ -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 \

1
src/support/forkedcontr.C
View File

@ -20,7 +20,6 @@
#include "debug.h"
#include <boost/bind.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <cerrno>
#include <cstdlib>

4
src/tex2lyx/Makefile.am
View File

@ -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 \