Unify the handling of converters that specify the resultfile= flag.

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 828ecb74cab20a068d7a3ad328d07adcf83f2e74..0e719fb53a15a7106dc463a895ac2bf0647bd103 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,8 @@ 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
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
+       $(srcdir)/config.h.in
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
@@ -23,12 +21,18 @@ SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
 
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
        INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
-       README.Win32 README.Cygwin README.localization lyx.man autogen.sh
+       README.Win32 README.Cygwin README.localization lyx.1in autogen.sh
 
 man_MANS = lyx.1
 
-lyx.1:
-       cp -p $(srcdir)/lyx.man lyx.1
+#Wait some time for bumping automake 1.11, which can use dist-xz
+#directly without this code, which is to be removed.
+#xz has low compression by default, but can be affected via
+#export XZ_OPT=-9ev put somewhere in the makefile.
+lyxdist: dist
+       bunzip2 $(PACKAGE)-$(VERSION).tar.bz2
+       xz -9 $(PACKAGE)-$(VERSION).tar
+       ls -hl $(PACKAGE)-$(VERSION).tar.*
 
 rpmdist: dist
        $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
@@ -43,6 +47,12 @@ rpmdist: dist
 doxydoc:
        cd sourcedoc; make doxydoc
 
+lfundoc:
+       development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
+
+keystest:
+       development/keystest/lyx_make.sh
+
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*