X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=c9d86b322bf67f15efe0df054f98e04cd30e1cef;hb=444dc60b23aaaad97f449315e22d4609c61ddb65;hp=12c7d3d07d08369d8d1be32f4c32db0de276c99e;hpb=d4548a95d68073c858b7a4b67d034a581e4ed036;p=lyx.git

diff --git a/config/common.am b/config/common.am
index 12c7d3d07d..c9d86b322b 100644
--- a/config/common.am
+++ b/config/common.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2
-
 CLEANFILES = pch.h.gch
 
 DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
@@ -22,7 +20,7 @@ $(PCH_FILE): $(PCH_SOURCE)
 	$(MAKE) PCH_FLAGS= pch-file
 
 pch-file:
-	$(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -o $(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"
@@ -32,14 +30,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
+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 =