X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fcommon.am;h=e87279b1157afc00634854a7839a958c3fca4e69;hb=00f2166df8af247f040b0444691f844261c2cb08;hp=12c7d3d07d08369d8d1be32f4c32db0de276c99e;hpb=d4548a95d68073c858b7a4b67d034a581e4ed036;p=lyx.git diff --git a/config/common.am b/config/common.am index 12c7d3d07d..e87279b115 100644 --- a/config/common.am +++ b/config/common.am @@ -1,8 +1,4 @@ -AUTOMAKE_OPTIONS = foreign dist-bzip2 - -CLEANFILES = pch.h.gch - -DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core +DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in @@ -10,36 +6,4 @@ 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 $(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 -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 =