X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=cabc35a4c02f05d628ea617de02841ebae80f543;hb=fc42fe4ff487971f9d9aaa607a2eb32b570613ad;hp=12c7d3d07d08369d8d1be32f4c32db0de276c99e;hpb=d4548a95d68073c858b7a4b67d034a581e4ed036;p=lyx.git diff --git a/config/common.am b/config/common.am index 12c7d3d07d..cabc35a4c0 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" @@ -30,16 +28,4 @@ endif 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 =