Really fix start_of_appendix output

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f71e765f569dcadfaf032024fe83717023810a6..5562fb4753db1b688c14a9c4d9d88ee48bf70aa4 100644 (file)
--- 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 \
@@ -285,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
        @: