More pch work.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8956 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-08-18 14:20:18 +00:00
parent 393d59f296
commit 197c26de99
35 changed files with 127 additions and 28 deletions

View File

@ -1,3 +1,7 @@
2004-08-18 Lars Gullik Bjonnes <larsbj@gullik.net>
* More pch work.
2004-08-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: instead of the previous code (which does not
@ -6,7 +10,7 @@
2004-07-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* configure.ac: add code that some xforms tests are run only once
even if both xforms and gtk are configured.
even if both xforms and gtk are configured.
2004-06-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>

View File

@ -4,3 +4,5 @@ libboostfilesystem.la
*.lo
.libs
.deps
pch.h.gch
pch.h.gch.dep

View File

@ -4,7 +4,8 @@ noinst_LTLIBRARIES = libboostfilesystem.la
INCLUDES = $(BOOST_INCLUDES)
AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostfilesystem_la_SOURCES = \
convenience.cpp \

View File

@ -0,0 +1,19 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/filesystem/config.hpp>
#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/scoped_array.hpp>
#include <boost/throw_exception.hpp>
#include <cassert>
#include <cerrno>
#include <cstdio> // for remove, rename
#include <cstring>
#include <cstring> // SGI MIPSpro compilers need this
#include <cstring> // SGI MIPSpro compilers need this
#include <string>
#include <sys/stat.h> // last_write_time() uses stat()
#include <vector>

View File

@ -4,3 +4,5 @@ libboostregex.la
*.lo
.deps
.libs
pch.h.gch
pch.h.gch.dep

View File

@ -4,7 +4,8 @@ noinst_LTLIBRARIES = libboostregex.la
INCLUDES = $(BOOST_INCLUDES)
AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostregex_la_SOURCES = \
cpp_regex_traits.cpp \

View File

@ -0,0 +1,14 @@
#include <cctype>
#include <climits>
#include <clocale>
#include <cstdio>
#include <cstring>
#include <cwchar>
#include <iostream>
#include <list>
#include <locale>
#include <map>
#include <new>
#include <ostream>
#include <set>
#include <stdexcept>

View File

@ -4,3 +4,5 @@ libboostsignals.la
*.lo
.deps
.libs
pch.h.gch
pch.h.gch.dep

View File

@ -4,7 +4,8 @@ noinst_LTLIBRARIES = libboostsignals.la
INCLUDES = $(BOOST_INCLUDES)
AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostsignals_la_SOURCES = \
connection.cpp \

View File

@ -0,0 +1,7 @@
#include <boost/signals/connection.hpp>
#include <boost/signals/detail/signal_base.hpp>
#include <boost/signals/slot.hpp>
#include <boost/signals/trackable.hpp>
#include <algorithm>
#include <cassert>

View File

@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = foreign
CLEANFILES = pch.h.gch
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
@ -10,12 +12,21 @@ AM_ETAGSFLAGS = --lang=c++
if LYX_BUILD_PCH
PCH_FLAGS = -Winvalid-pch --include=pch.h
PCH_FILE = pch.h.gch
PCH_FILE = ./pch.h.gch
PCH_SOURCE = ./pch.h
sinclude pch.h.gch.dep
*.C *.cpp: $(PCH_FILE)
pch.h.gch: $(PCH_SOURCE)
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) \
-x c++-header $(PCH_SOURCE) -MT $@ -MD -MP -MF "./$@.Tdep" \
&& mv "./$@.Tdep" "./$@.dep" || rm "./$@.Tdep"
endif
pch.h.gch:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -x c++-header pch.h
SUFFIXES = .gch
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost

View File

@ -14,3 +14,4 @@ stamp-version
*.deps
.libs
pch.h.gch
pch.h.gch.dep

View File

@ -58,8 +58,6 @@ BUILT_SOURCES = version.C
AM_CXXFLAGS = $(PCH_FLAGS)
lyx_DEPENDENCIES = $(PCH_FILE)
lyx_SOURCES = \
Bidi.C \
Bidi.h \

View File

@ -5,3 +5,4 @@ Makefile.in
.libs
libfrontends.la
pch.h.gch
pch.h.gch.dep

View File

@ -10,8 +10,6 @@ INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libfrontends_la_DEPENDENCIES = $(PCH_FILE)
libfrontends_la_SOURCES = \
Alert.C \
Alert.h \

View File

@ -5,3 +5,4 @@ Makefile
.libs
libcontrollers.la
pch.h.gch
pch.h.gch.dep

View File

@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libcontrollers.la
AM_CXXFLAGS = $(PCH_FLAGS)
libcontrollers_la_SOURCES= \
$(PCH_FILE) Dialog.C \
Dialog.C \
Dialog.h \
Kernel.C \
Kernel.h \

View File

@ -15,9 +15,8 @@ noinst_LTLIBRARIES = libqt2.la
libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CXXFLAGS = $(PCH_FLAGS) -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
libqt2_la_DEPENDENCIES = $(PCH_FILE)
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
AM_CXXFLAGS = $(PCH_FLAGS)
libqt2_la_SOURCES = \
QDialogView.C \

View File

@ -11,3 +11,4 @@ lyx_xpm.h
lyx_xpm.h-tmp
stamp-xpm
pch.h.gch
pch.h.gch.dep

View File

@ -1,7 +1,7 @@
include $(top_srcdir)/config/common.am
SUBDIRS = forms
CLEANFILES = stamp-xpm stamp-forms
CLEANFILES += stamp-xpm stamp-forms
DISTCLEANFILES += lyx_forms.h lyx_forms.h-tmp lyx_xpm.h lyx_xpm.h-tmp
BUILT_SOURCES = lyx_forms.h lyx_xpm.h
@ -18,8 +18,6 @@ noinst_LTLIBRARIES = libxforms.la
libxforms_la_LIBADD = @XFORMS_LIBS@ forms/*.lo
libxforms_la_DEPENDENCIES = $(PCH_FILE)
# Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_la_SOURCES = \
forms_fwd.h \

View File

@ -7,3 +7,5 @@ Makefile
*.lo
.deps
libfdesign.la
pch.h.gch
pch.h.gch.dep

View File

@ -7,6 +7,8 @@ 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_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libfdesign.la
SRCS = form_aboutlyx.fd \

View File

@ -0,0 +1,10 @@
#include <config.h>
#include "bmtable.h"
#include "combox.h"
#include "fdesign_base.h"
#include "gettext.h"
#include "../lyx_forms.h"
#include <stdlib.h>

View File

@ -5,3 +5,4 @@ Makefile
.libs
libgraphics.la
pch.h.gch
pch.h.gch.dep

View File

@ -7,7 +7,7 @@ INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libgraphics_la_SOURCES = \
$(PCH_FILE) GraphicsCache.h \
GraphicsCache.h \
GraphicsCache.C \
GraphicsCacheItem.h \
GraphicsCacheItem.C \

View File

@ -5,3 +5,4 @@ Makefile
.libs
libinsets.la
pch.h.gch
pch.h.gch.dep

View File

@ -10,10 +10,8 @@ EXTRA_DIST = \
AM_CXXFLAGS = $(PCH_FLAGS)
libinsets_la_DEPENDENCIES = $(PCH_FILE)
libinsets_la_SOURCES = \
$(PCH_FILE) mailinset.C \
mailinset.C \
mailinset.h \
ExternalSupport.C \
ExternalSupport.h \

View File

@ -1,5 +1,7 @@
#include <config.h>
#include "insetbase.h"
#include <boost/any.hpp>
#include <boost/assert.hpp>
#include <boost/function.hpp>

View File

@ -5,3 +5,4 @@ Makefile
.libs
libmathed.la
pch.h.gch
pch.h.gch.dep

View File

@ -8,10 +8,8 @@ INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libmathed_la_DEPENDENCIES = $(PCH_FILE)
libmathed_la_SOURCES = \
$(PCH_FILE) textpainter.C \
textpainter.C \
textpainter.h \
math_amsarrayinset.C \
math_amsarrayinset.h \

View File

@ -6,3 +6,4 @@ libsupport.la
.libs
path_defines.C
pch.h.gch
pch.h.gch.dep

View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libsupport.la
CLEANFILES = path_defines.C
CLEANFILES += path_defines.C
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
@ -17,7 +17,7 @@ BUILT_SOURCES = path_defines.C
AM_CXXFLAGS = $(PCH_FLAGS)
libsupport_la_SOURCES = \
$(PCH_FILE) FileInfo.C \
FileInfo.C \
FileInfo.h \
FileMonitor.h \
FileMonitor.C \

View File

@ -13,3 +13,5 @@ lyxlayout.[Ch]
lyxtextclass.[Ch]
lyxlex.C
lyxlex_pimpl.C
pch.h.gch
pch.h.gch.dep

View File

@ -14,6 +14,8 @@ DISTCLEANFILES += $(BUILT_SOURCES)
bin_PROGRAMS = tex2lyx
AM_CXXFLAGS = $(PCH_FLAGS)
BUILT_SOURCES = \
FloatList.C \
Floating.C \

18
src/tex2lyx/pch.h Normal file
View File

@ -0,0 +1,18 @@
#include <config.h>
#include <boost/assert.hpp>
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
#include <algorithm>
#include <cctype>
#include <cstdlib>
#include <exception>
#include <fstream>
#include <iosfwd>
#include <iostream>
#include <map>
#include <sstream>
#include <string>
#include <vector>