Really fix start_of_appendix output

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5df6fdfa49f7030fd8cab02a479e2a49c58e4554..5562fb4753db1b688c14a9c4d9d88ee48bf70aa4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += config.h libintl.h
+DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends tex2lyx
+SUBDIRS = mathed insets graphics support frontends . client tex2lyx
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
+EXTRA_DIST = config.h.in stamp-h.in version.C.in \
        Sectioning.h \
        Sectioning.C \
        Variables.C \
@@ -20,12 +20,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
-       ../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,10 +47,10 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-INCLUDES = $(BOOST_INCLUDES)
-
 BUILT_SOURCES = version.C
 
+AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
+
 lyx_SOURCES = \
        Bidi.C \
        Bidi.h \
@@ -77,6 +72,8 @@ lyx_SOURCES = \
        FloatList.h \
        Floating.C \
        Floating.h \
+       FontIterator.C \
+       FontIterator.h \
        FuncStatus.C \
        FuncStatus.h \
        InsetList.C \
@@ -94,11 +91,9 @@ lyx_SOURCES = \
        ParagraphList_fwd.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
-       ParameterStruct.h \
        PrinterParams.C \
        PrinterParams.h \
        RowList_fwd.h \
-       ShareContainer.h \
        Spacing.C \
        Spacing.h \
        Thesaurus.C \
@@ -113,7 +108,6 @@ lyx_SOURCES = \
        boost.C \
        box.h \
        box.C \
-       broken_headers.h \
        buffer.C \
        buffer.h \
        buffer_funcs.C \
@@ -128,12 +122,13 @@ lyx_SOURCES = \
        changes.h \
        chset.C \
        chset.h \
-       lfuns.h \
        config.h.in \
        converter.C \
        converter.h \
        counters.C \
        counters.h \
+       coordcache.C \
+       coordcache.h \
        cursor.C \
        cursor.h \
        cursor_slice.C \
@@ -142,6 +137,8 @@ lyx_SOURCES = \
        debug.h \
        dimension.C \
        dimension.h \
+       dociterator.C \
+       dociterator.h \
        dispatchresult.h \
        encoding.C \
        encoding.h \
@@ -163,8 +160,8 @@ lyx_SOURCES = \
        importer.h \
        intl.C \
        intl.h \
-       iterators.C \
-       iterators.h \
+       insetiterator.C \
+       insetiterator.h \
        kbmap.C \
        kbmap.h \
        kbsequence.C \
@@ -176,14 +173,13 @@ lyx_SOURCES = \
        layout.h \
        lengthcommon.C \
        lengthcommon.h \
+       lfuns.h \
        lyx_cb.C \
        lyx_cb.h \
        lyx_main.C \
        lyx_main.h \
        lyx_sty.C \
        lyx_sty.h \
-       lyxcursor.C \
-       lyxcursor.h \
        lyxfont.C \
        lyxfont.h \
        lyxfind.C \
@@ -222,8 +218,11 @@ lyx_SOURCES = \
        messages.h \
        metricsinfo.C \
        metricsinfo.h \
+       mover.C \
+       mover.h \
        output.C \
        output.h \
+       outputparams.C \
        outputparams.h \
        output_docbook.C \
        output_docbook.h \
@@ -240,8 +239,8 @@ lyx_SOURCES = \
        paragraph_funcs.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       PosIterator.h \
-       PosIterator.C \
+       pariterator.C \
+       pariterator.h \
        SpellBase.h \
        ispell.C \
        ispell.h \
@@ -262,8 +261,6 @@ lyx_SOURCES = \
        text.C \
        text2.C \
        text3.C \
-       textcursor.C \
-       textcursor.h \
        toc.C \
        toc.h \
        trans.C \
@@ -280,9 +277,6 @@ lyx_SOURCES = \
        vspace.C \
        vspace.h
 
-dist-hook:
-       cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
-
 version.C: stamp-version
        @: