X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fcommon.am;h=fbfb2c82fbf17eed2961c5df9eab48120e9e8efe;hb=2de99bed22564af4d535bdfb61b07a0745e71d76;hp=0f14f70ad6770a2f62c3f052019bc5b456f1d304;hpb=55bb299483e54a48d029703c27e1881aa90b4548;p=lyx.git

diff --git a/config/common.am b/config/common.am
index 0f14f70ad6..fbfb2c82fb 100644
--- a/config/common.am
+++ b/config/common.am
@@ -1,10 +1,45 @@
-AUTOMAKE_OPTIONS = foreign
+CLEANFILES = pch.h.gch
 
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
+DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-ETAGS_ARGS = --lang=c++
+AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
 
+AM_ETAGSFLAGS = --lang=c++
+
+if LYX_BUILD_PCH
+PCH_SOURCE = $(srcdir)/pch.h
+PCH_FLAGS = -Winvalid-pch --include=$(PCH_SOURCE)
+PCH_FILE = ./pch.h.gch
+sinclude ./pch.h.gch.dep
+
+*.o *.lo *.obj: $(PCH_FILE)
+
+$(PCH_FILE): $(PCH_SOURCE)
+	$(MAKE) PCH_FLAGS= pch-file
+
+pch-file:
+	$(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -o $(PCH_FILE) \
+	-MT $(PCH_FILE)  -MD -MP -MF "./$(PCH_FILE).Tdep" \
+	&& mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" \
+	|| rm "./$(PCH_FILE).Tdep"
+endif
+
+SUFFIXES = .gch
+
+if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
-SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
+BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+else
+BOOST_INCLUDES =
+BOOST_FILESYSTEM = -lboost_filesystem
+BOOST_REGEX = -lboost_regex
+BOOST_SIGNALS = -lboost_signals
+BOOST_IOSTREAMS = -lboost_iostreams
+endif
+
+LIBS =