make "make distcheck" work

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index 69ebe4bef1c7f8beee81d18fb8b3308f53d5d891..5803f59f523aaea39f56bb534e9025ba42de5b47 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -11,18 +11,20 @@ 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
+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"
+$(PCH_FILE): $(PCH_SOURCE)
+       $(MAKE) PCH_FLAGS= pch-file
+
+pch-file:
+       $(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -MT $(PCH_FILE)  -MD -MP \
+        -MF "./$(PCH_FILE).Tdep" \
+       && mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" || rm "./$(PCH_FILE).Tdep"
 
 endif
 
@@ -30,6 +32,14 @@ SUFFIXES = .gch
 
 if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
+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
+else
+BOOST_INCLUDES =
+BOOST_FILESYSTEM = -lboost_filesystem
+BOOST_REGEX = -lboost_regex
+BOOST_SIGNALS = -lboost_signals
 endif
 
 LIBS =