X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=885fd48c13b5efb980e4a22f5eff176eb2ac9a3e;hb=e54ae72e5fac6f750c3f7972c74bb42b57f3a049;hp=4c2e880625826f7517fbc40e9ad4dcdd85a6459d;hpb=c5186dcb4dd1dd04ff147103f1895d796cbea477;p=lyx.git

diff --git a/config/common.am b/config/common.am
index 4c2e880625..885fd48c13 100644
--- a/config/common.am
+++ b/config/common.am
@@ -1,8 +1,6 @@
-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
 
@@ -11,25 +9,34 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
 AM_ETAGSFLAGS = --lang=c++
 
 if LYX_BUILD_PCH
-PCH_FLAGS = -Winvalid-pch --include=./pch.h
+PCH_SOURCE = $(srcdir)/pch.h
+PCH_FLAGS = -Winvalid-pch --include=$(PCH_SOURCE)
 PCH_FILE = ./pch.h.gch
-PCH_SOURCE = ./pch.h
 sinclude ./pch.h.gch.dep
 
-*.C *.cpp: $(PCH_FILE)
+*.o *.lo *.obj: $(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"
+$(PCH_FILE): $(PCH_SOURCE)
+	$(MAKE) PCH_FLAGS= pch-file
 
+pch-file:
+	$(CXXCOMPILE) -x c++-header -fPIC -DPIC $(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
+BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
+else
+BOOST_INCLUDES =
+BOOST_FILESYSTEM = -lboost_filesystem
+BOOST_REGEX = -lboost_regex
+BOOST_SIGNALS = -lboost_signals
+BOOST_IOSTREAMS = -lboost_iostreams
 endif
 
 LIBS =