one more mistake...

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index f7eb781203888fdb2b29217b3d49256d03449d86..c9d86b322bf67f15efe0df054f98e04cd30e1cef 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -1,12 +1,43 @@
-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 -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
-SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
+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
+BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
+endif
 
 LIBS =