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

diff --git a/src/Makefile.am b/src/Makefile.am
index 2601365faf..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@
 
@@ -282,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
 	@: