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

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a06fe358e684beede5dcc682ccf0ffc8759831b..7237120f7df97d333a5fa6d2397b292d533bfc6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +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
+BOOST = boost
+endif
 
-SUBDIRS = config development intl po boost src sourcedoc lib
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+       $(CLIENT) src/tex2lyx
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man autogen.sh images
 
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+       README.Win32 README.Cygwin lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -23,13 +34,14 @@ bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 lyx.1:
        cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-       cd $(distdir) ; \
-       rm -rf `find images -name \*CVS\*`
-
 rpmdist: dist
-       ln -s lib/images/lyx.xpm . ; \
-       rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+       $(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
+       if [ -z "`type -path rpmbuild`" ]; \
+       then \
+               RPMBUILD=rpm; \
+       else \
+               RPMBUILD=rpmbuild; \
+       fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
        rm lyx.xpm; exit $$saved_status
 
 bindist:
@@ -53,15 +65,11 @@ bindist:
        @echo "*** distribution and refer to *you* in case of problem."
        @echo "*** $(bindistfile) has been created."
 
-doxydoc: sourcedoc/Doxyfile
-       cd sourcedoc; \
-       doxygen ./Doxyfile
-
-distclean-local:
-       rm -rf $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-       $(srcdir)/sourcedoc/main
+doxydoc:
+       cd sourcedoc; make doxydoc
 
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: sourcedoc
+.PHONY: doxydoc
+