* insetbranch.C (textString): implement, so that branches appear

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index 5803f59f523aaea39f56bb534e9025ba42de5b47..fbfb2c82fbf17eed2961c5df9eab48120e9e8efe 100644 (file)
--- 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
 
@@ -16,16 +14,16 @@ PCH_FLAGS = -Winvalid-pch --include=$(PCH_SOURCE)
 PCH_FILE = ./pch.h.gch
 sinclude ./pch.h.gch.dep
 
-*.C *.cpp: $(PCH_FILE)
+*.o *.lo *.obj: $(PCH_FILE)
 
 $(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"
-
+       $(CXXCOMPILE) -x c++-header $(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
@@ -35,11 +33,13 @@ 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
+BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
 else
 BOOST_INCLUDES =
 BOOST_FILESYSTEM = -lboost_filesystem
 BOOST_REGEX = -lboost_regex
 BOOST_SIGNALS = -lboost_signals
+BOOST_IOSTREAMS = -lboost_iostreams
 endif
 
 LIBS =