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

diff --git a/src/Makefile.am b/src/Makefile.am
index bae5416a49..5562fb4753 100644
--- 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 \
@@ -87,21 +84,16 @@ lyx_SOURCES = \
 	LaTeX.h \
 	LaTeXFeatures.C \
 	LaTeXFeatures.h \
-	latexrunparams.h \
 	LyXAction.C \
 	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 \
@@ -116,7 +108,6 @@ lyx_SOURCES = \
 	boost.C \
 	box.h \
 	box.C \
-	broken_headers.h \
 	buffer.C \
 	buffer.h \
 	buffer_funcs.C \
@@ -131,18 +122,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 \
@@ -164,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 \
@@ -177,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 \
@@ -223,11 +218,29 @@ 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 \
+	output_latex.C \
+	output_latex.h \
+	output_linuxdoc.C \
+	output_linuxdoc.h \
+	output_plaintext.C \
+	output_plaintext.h \
 	paper.h \
 	paragraph.C \
 	paragraph.h \
+	paragraph_funcs.C \
+	paragraph_funcs.h \
 	paragraph_pimpl.C \
 	paragraph_pimpl.h \
+	pariterator.C \
+	pariterator.h \
 	SpellBase.h \
 	ispell.C \
 	ispell.h \
@@ -248,10 +261,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 \
@@ -268,9 +277,6 @@ lyx_SOURCES = \
 	vspace.C \
 	vspace.h
 
-dist-hook:
-	cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
-
 version.C: stamp-version
 	@: