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

diff --git a/src/Makefile.am b/src/Makefile.am
index 5562fb4753..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
@@ -22,7 +27,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 
 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)
@@ -47,9 +52,21 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = version.C
+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
+
 
-AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 lyx_SOURCES = \
 	Bidi.C \
@@ -101,8 +118,6 @@ lyx_SOURCES = \
 	ToolbarBackend.C \
 	ToolbarBackend.h \
 	WordLangTuple.h \
-	aspell.C \
-	aspell_local.h \
 	author.C \
 	author.h \
 	boost.C \
@@ -241,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 \