X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=6f7e31033779a7b6b2eaf9133e8c855abb40dbd9;hb=660d2e98144ce7ec32867c34c411243688a53094;hp=f2b0617747d23e9be26ad06abcb6064c1a560ecb;hpb=c73eea9bdafad993022b65bcc7ed3b1e22181e1d;p=lyx.git

diff --git a/config/common.am b/config/common.am
index f2b0617747..6f7e310337 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,33 @@ 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) \
-        $(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.a
+else
+BOOST_INCLUDES =
+BOOST_REGEX = -lboost_regex$(BOOST_MT)
+BOOST_SIGNALS = -lboost_signals$(BOOST_MT)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
 endif
 
 LIBS =