Change to use preffered calling of Boost.Function

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c54871bcd4f4331789b8aa819b64a9b765cad407..19a9819b1f4f8c64d77a59b4f568785889da1704 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 \
@@ -21,8 +21,8 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        support/libsupport.la
 
 if USE_INCLUDED_BOOST
-BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
-       ../boost/libs/signals/src/libboostsignals.la
+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
@@ -56,6 +56,8 @@ INCLUDES = $(BOOST_INCLUDES)
 
 BUILT_SOURCES = version.C
 
+AM_CXXFLAGS = $(PCH_FLAGS)
+
 lyx_SOURCES = \
        Bidi.C \
        Bidi.h \
@@ -77,6 +79,8 @@ lyx_SOURCES = \
        FloatList.h \
        Floating.C \
        Floating.h \
+       FontIterator.C \
+       FontIterator.h \
        FuncStatus.C \
        FuncStatus.h \
        InsetList.C \
@@ -91,16 +95,12 @@ lyx_SOURCES = \
        LyXAction.h \
        MenuBackend.C \
        MenuBackend.h \
-       paragraph_funcs.C \
-       paragraph_funcs.h \
        ParagraphList_fwd.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
-       ParameterStruct.h \
        PrinterParams.C \
        PrinterParams.h \
        RowList_fwd.h \
-       ShareContainer.h \
        Spacing.C \
        Spacing.h \
        Thesaurus.C \
@@ -130,18 +130,23 @@ 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 \
+       cursor_slice.h \
        debug.C \
        debug.h \
        dimension.C \
        dimension.h \
+       dociterator.C \
+       dociterator.h \
        dispatchresult.h \
        encoding.C \
        encoding.h \
@@ -163,8 +168,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 +181,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 \
@@ -224,6 +228,7 @@ lyx_SOURCES = \
        metricsinfo.h \
        output.C \
        output.h \
+       outputparams.C \
        outputparams.h \
        output_docbook.C \
        output_docbook.h \
@@ -236,10 +241,12 @@ lyx_SOURCES = \
        paper.h \
        paragraph.C \
        paragraph.h \
+       paragraph_funcs.C \
+       paragraph_funcs.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       PosIterator.h \
-       PosIterator.C \
+       pariterator.C \
+       pariterator.h \
        SpellBase.h \
        ispell.C \
        ispell.h \
@@ -260,10 +267,6 @@ lyx_SOURCES = \
        text.C \
        text2.C \
        text3.C \
-       textcursor.C \
-       textcursor.h \
-       text_funcs.C \
-       text_funcs.h \
        toc.C \
        toc.h \
        trans.C \
@@ -280,8 +283,21 @@ lyx_SOURCES = \
        vspace.C \
        vspace.h
 
-dist-hook:
-       cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
+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
        @: