X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=af9260dfba5afac5ed87dc5ca5d81b9690664639;hb=b80e9503feea2e66c0bcc2b45b413aad1a9a61e2;hp=686b4d31feffeebe3532a86b6393aa151e752719;hpb=f82c3e8e6543e54d2c8031092616aa5473d66d4c;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 686b4d31fe..af9260dfba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,37 +2,35 @@ 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)/config.h.in
 
-MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure
-
-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 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
 
-## Needed by bindist
-bindistdir=$(PWD)/lyxbin
-bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
-
-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 . ; \
@@ -44,32 +42,28 @@ rpmdist: dist
 	fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
 	rm lyx.png; 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."
-
 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