Sort and format comments

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5eaf4efa2103720fbc87d12934d001fb83deb8bb..bfccb7985b9ad57987191c7316dc0fed1a74e83c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,67 +1,63 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += lyx.1 config.status config.cache config.log
+ACLOCAL_AMFLAGS = -I m4 -I config
 
-MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-       $(srcdir)/configure \
-       $(srcdir)/acinclude.m4
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
+       $(srcdir)/config.h.in
 
-SUBDIRS = config development intl po boost src sourcedoc lib
+DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man autogen.sh images
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
 
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
 
-man_MANS = lyx.1
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
+       $(CLIENT) src/tex2lyx src/convert
+
 
-## Needed by bindist
-bindistdir=$(PWD)/lyxbin
-bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+       INSTALL.Cygwin README.localization lyx.1in \
+       autogen.sh CMakeLists.txt po/CMakeLists.txt
 
-lyx.1:
-       cp -p $(srcdir)/lyx.man lyx.1
+man_MANS = lyx.1
 
-dist-hook:
-       cd $(distdir) ; \
-       rm -rf `find images -name \*CVS\*`
+# Set high compression level for xz distribution
+export XZ_OPT=-9ev
 
 rpmdist: dist
-       ln -s $(srcdir)/lib/images/lyx.xpm . ; \
+       $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
        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:
-       rm -f $(bindistfile)
-       $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
-       if test -f $(top_srcdir)/README.bin ; then \
-         $(INSTALL) $(top_srcdir)/README.bin \
-               $(bindistdir)$(prefix)/README.bin ; \
-       fi
-       (cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \
-       GZIP=$(GZIP_ENV) gzip > $(bindistfile)
-       -chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir)
-       @if test -f $(top_srcdir)/README.bin ; then \
-         echo "*** Did you remember to check the contents of README.bin?" ; \
-       else \
-         echo "*** WARNING: You did not provide a README.bin file." ; \
-         echo "*** Please make one now from the example file" ; \
-         echo "***   development/tools/README.bin.example" ; \
-       fi
-       @echo "*** It should mention any problem concerning your binary"
-       @echo "*** distribution and refer to *you* in case of problem."
-       @echo "*** $(bindistfile) has been created."
+       rm lyx.png; exit $$saved_status
 
 doxydoc:
-       cd sourcedoc; make doxydoc
+       cd sourcedoc; $(MAKE) doxydoc
+
+lfundoc: $(srcdir)/lib/doc/LFUNs.lyx
+
+$(srcdir)/lib/doc/LFUNs.lyx: $(srcdir)/development/tools/gen_lfuns.py $(srcdir)/src/LyXAction.cpp
+       $(AM_V_GEN)$(PYTHON) $^ >$@ 2>/dev/null
+
+keystest:
+       development/keystest/lyx_make.sh
+
+alltests: check alltests-recursive
+
+alltests-recursive:
+       cd lib; $(MAKE) alltests-recursive
+       cd src; $(MAKE) alltests-recursive
+
+updatetests:
+       cd src; $(MAKE) updatetests
 
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: doxydoc
+.PHONY: doxydoc alltests alltests-recursive updatetests
+