X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8fb666f401c094d3c8cc5f5e13244228f76df01d;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf;hpb=c22d1bb43069c4f7736dd6a4f8a38831d97d9ad8;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index a617a46aac..8fb666f401 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,66 +2,58 @@ 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
 
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+BOOST = boost
 endif
 
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
+
+
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
-	lyx.man autogen.sh
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+	README.Win32 README.Cygwin README.localization lyx.1in \
+	autogen.sh
 
 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.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
 
+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)/*