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

diff --git a/src/Makefile.am b/src/Makefile.am
index e9aa27be53..c5aa12b6ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,19 @@ DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
 
 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 = $(top_builddir)/boost/libs/regex/src/libboostregex.la \
-	$(top_builddir)/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,11 +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
 
-AM_CXXFLAGS = $(PCH_FLAGS)
 
 lyx_SOURCES = \
 	Bidi.C \
@@ -108,8 +118,6 @@ lyx_SOURCES = \
 	ToolbarBackend.C \
 	ToolbarBackend.h \
 	WordLangTuple.h \
-	aspell.C \
-	aspell_local.h \
 	author.C \
 	author.h \
 	boost.C \
@@ -248,11 +256,8 @@ lyx_SOURCES = \
 	paragraph_pimpl.h \
 	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 \
@@ -284,22 +289,6 @@ lyx_SOURCES = \
 	vspace.C \
 	vspace.h
 
-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
 	@: