X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=5562fb4753db1b688c14a9c4d9d88ee48bf70aa4;hb=530749439472bddf13d9f4ee74ee6184ef76e3f9;hp=19a9819b1f4f8c64d77a59b4f568785889da1704;hpb=e0a50d3fb829aa92b7cda04037b350a4355b44f8;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 19a9819b1f..5562fb4753 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,12 +20,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 	graphics/libgraphics.la \
 	support/libsupport.la
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = $(top_builddir)/boost/libs/regex/src/libboostregex.la \
-	$(top_builddir)/boost/libs/signals/src/libboostsignals.la
-else
-BOOST_LIBS = -lboost_regex -lboost_signals
-endif
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
 
@@ -52,11 +47,9 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-INCLUDES = $(BOOST_INCLUDES)
-
 BUILT_SOURCES = version.C
 
-AM_CXXFLAGS = $(PCH_FLAGS)
+AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 lyx_SOURCES = \
 	Bidi.C \
@@ -115,7 +108,6 @@ lyx_SOURCES = \
 	boost.C \
 	box.h \
 	box.C \
-	broken_headers.h \
 	buffer.C \
 	buffer.h \
 	buffer_funcs.C \
@@ -226,6 +218,8 @@ lyx_SOURCES = \
 	messages.h \
 	metricsinfo.C \
 	metricsinfo.h \
+	mover.C \
+	mover.h \
 	output.C \
 	output.h \
 	outputparams.C \
@@ -283,22 +277,6 @@ lyx_SOURCES = \
 	vspace.C \
 	vspace.h
 
-dist_noinst_DATA = \
-	cheaders/ChangeLog \
-	cheaders/cassert \
-	cheaders/cctype \
-	cheaders/cerrno \
-	cheaders/climits \
-	cheaders/clocale \
-	cheaders/cmath \
-	cheaders/csignal \
-	cheaders/cstdarg \
-	cheaders/cstddef \
-	cheaders/cstdio \
-	cheaders/cstdlib \
-	cheaders/cstring \
-	cheaders/ctime
-
 version.C: stamp-version
 	@: