X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=6f7e31033779a7b6b2eaf9133e8c855abb40dbd9;hb=8e23cfdbdc8fb06999ba2c964c86704d15131ecc;hp=510b4dd05e92a7b3203a8e38e7452de4e8ddd4c9;hpb=b0fbc29aa34345e1ffa54f6fd9193d7c42e577f2;p=lyx.git

diff --git a/config/common.am b/config/common.am
index 510b4dd05e..6f7e310337 100644
--- a/config/common.am
+++ b/config/common.am
@@ -1,6 +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
 
@@ -9,16 +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_FILE = pch.h.gch
+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 -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
 
-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
+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 =