X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=c5aa12b6ce833940c2ac0b5fa0b1f58952ff2098;hb=fd2124c83dfcfeaf33b64d1d33c8ceb8d9f5f9b9;hp=455a559fa8e3ac9c4f5001c70e78d5e23b4ef748;hpb=fc52df82433c1108667dea9d38f0ac4f557b3f0c;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 455a559fa8..c5aa12b6ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,22 @@
 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
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+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 \
 	Variables.h \
-	paper.h
+	paper.h \
+	pch.h
 
 LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
 	frontends/libfrontends.la
@@ -20,14 +25,9 @@ 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@
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)
@@ -52,9 +52,21 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-INCLUDES = $(BOOST_INCLUDES)
+BUILT_SOURCES = $(PCH_FILE) version.C
+
+AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
+
+if USE_ASPELL
+ASPELL = aspell.C aspell_local.h
+endif
+if USE_PSPELL
+PSPELL = pspell.C pspell.h
+endif
+if USE_ISPELL
+ISPELL = ispell.C ispell.h
+endif
+
 
-BUILT_SOURCES = version.C
 
 lyx_SOURCES = \
 	Bidi.C \
@@ -96,11 +108,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 \
@@ -108,14 +118,11 @@ lyx_SOURCES = \
 	ToolbarBackend.C \
 	ToolbarBackend.h \
 	WordLangTuple.h \
-	aspell.C \
-	aspell_local.h \
 	author.C \
 	author.h \
 	boost.C \
 	box.h \
 	box.C \
-	broken_headers.h \
 	buffer.C \
 	buffer.h \
 	buffer_funcs.C \
@@ -135,6 +142,8 @@ lyx_SOURCES = \
 	converter.h \
 	counters.C \
 	counters.h \
+	coordcache.C \
+	coordcache.h \
 	cursor.C \
 	cursor.h \
 	cursor_slice.C \
@@ -166,8 +175,8 @@ lyx_SOURCES = \
 	importer.h \
 	intl.C \
 	intl.h \
-	iterators.C \
-	iterators.h \
+	insetiterator.C \
+	insetiterator.h \
 	kbmap.C \
 	kbmap.h \
 	kbsequence.C \
@@ -224,8 +233,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 \
@@ -242,13 +254,10 @@ lyx_SOURCES = \
 	paragraph_funcs.h \
 	paragraph_pimpl.C \
 	paragraph_pimpl.h \
-	PosIterator.h \
-	PosIterator.C \
+	pariterator.C \
+	pariterator.h \
+	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.C \
 	SpellBase.h \
-	ispell.C \
-	ispell.h \
-	pspell.C \
-	pspell.h \
 	rowpainter.C \
 	rowpainter.h \
 	sgml.C \
@@ -280,9 +289,6 @@ lyx_SOURCES = \
 	vspace.C \
 	vspace.h
 
-dist-hook:
-	cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
-
 version.C: stamp-version
 	@: