Fix the tab ordering of GuiDocument components.

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index eba1a6a4d197eabc52f85ed6394cd02e59d6b90f..6f7e31033779a7b6b2eaf9133e8c855abb40dbd9 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -20,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"
@@ -30,13 +30,12 @@ SUFFIXES = .gch
 
 if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
-BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
+BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =
-BOOST_FILESYSTEM = -lboost_filesystem
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
+BOOST_REGEX = -lboost_regex$(BOOST_MT)
+BOOST_SIGNALS = -lboost_signals$(BOOST_MT)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
 endif
 
 LIBS =