Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 79d24eede64ce7298cf076cfd7ebb8b345c967fa..7237120f7df97d333a5fa6d2397b292d533bfc6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,29 @@
 include $(top_srcdir)/config/common.am
 
+ACLOCAL_AMFLAGS = -I m4 -I config
+
 DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-       $(srcdir)/configure \
-       $(srcdir)/acinclude.m4
+       $(srcdir)/configure
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+BOOST = boost
 endif
 
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+       $(CLIENT) src/tex2lyx
+
+
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-       INSTALL.Win32 INSTALL.MacOSX README.Win32 \
-       lyx.man autogen.sh
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+       README.Win32 README.Cygwin lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -66,4 +73,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4