X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=af9260dfba5afac5ed87dc5ca5d81b9690664639;hb=44e88a4c1324fed447ab5510734c741d18f856c0;hp=96783b16b39063392be64048a3a20bde4b8c2a67;hpb=e5e65c031c05dee8caa0995219c208ecd5e80dde;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 96783b16b3..af9260dfba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,34 +2,35 @@ include $(top_srcdir)/config/common.am
 
 ACLOCAL_AMFLAGS = -I m4 -I config
 
-DISTCLEANFILES += lyx.1
-
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
 	$(srcdir)/config.h.in
 
-DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+DIST_SUBDIRS = 3rdparty autotests m4 config development po 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 \
-	$(CLIENT) src/tex2lyx
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
+	$(CLIENT) src/tex2lyx src/convert
 
 
 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
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+	README.Win32 README.Cygwin README.localization lyx.1in \
+	autogen.sh CMakeLists.txt po/CMakeLists.txt
 
 man_MANS = lyx.1
 
-lyx.1:
-	sed -e "s/LYX_DIR_VER/$(LYX_DIR_VER)/g" \
-	    -e "s/LYX_USERDIR_VER/$(LYX_USERDIR_VER)/g" $(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 . ; \
@@ -42,10 +43,27 @@ rpmdist: dist
 	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