Change to use preffered calling of Boost.Function

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d26782ad9c6e965551468dcfe7087e811d75a7c4..19a9819b1f4f8c64d77a59b4f568785889da1704 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,9 @@ 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 \
@@ -99,7 +101,6 @@ lyx_SOURCES = \
        PrinterParams.C \
        PrinterParams.h \
        RowList_fwd.h \
-       ShareContainer.h \
        Spacing.C \
        Spacing.h \
        Thesaurus.C \
@@ -134,6 +135,8 @@ lyx_SOURCES = \
        converter.h \
        counters.C \
        counters.h \
+       coordcache.C \
+       coordcache.h \
        cursor.C \
        cursor.h \
        cursor_slice.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
        @: