X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=5eaf4efa2103720fbc87d12934d001fb83deb8bb;hb=3e97d1fee27499733d07ddb38d10ead8c0612c96;hp=8f881c20390f0c66bd037123bc1723018df33b5a;hpb=0e2fed29eae2255f3dc094c47dbcc0142ebfa8a9;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 8f881c2039..5eaf4efa21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,67 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
-	development/lyx.spec
-SUBDIRS = intl po src lib
-
-EXTRA_DIST = ANNOUNCE CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING WHATSNEW acconfig.h lyx.man \
-	config development forms images
-ETAGS_ARGS = --c++
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+	$(srcdir)/configure \
+	$(srcdir)/acinclude.m4
+
+SUBDIRS = config development intl po boost src sourcedoc lib
+
+EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
+	UPGRADING lyx.man autogen.sh images
+
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
+
 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
 
 dist-hook:
-	cd $(distdir) ; rm -rf `find config -name \*CVS\*` ; \
-	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find forms -name \*CVS\*` ; \
+	cd $(distdir) ; \
 	rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
-	ln -s images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-	rm lyx.xpm
\ No newline at end of file
+	ln -s $(srcdir)/lib/images/lyx.xpm . ; \
+	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."
+
+doxydoc:
+	cd sourcedoc; make doxydoc
+
+lgbtags:
+	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc