X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7756d429e21b32dca5526e18885b95069eb25063;hb=a9a371fb5e3bbd3c63c66a12dfcd04f4a0f7a2b6;hp=330ec6ca64fa613dca18f5a4e1be2100e34e1aac;hpb=97955f6e12d706a231e853560baebdf1f9bcfd1e;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 330ec6ca64..7756d429e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,68 +1,67 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core \
-	config.status config.cache config.log \
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += -r lyx.1 config.status config.cache config.log \
 	$(srcdir)/sourcedoc/*~ \
 	$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
 	$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
-SUBDIRS = intl po sigc++ boost src lib
+	$(srcdir)/acinclude.m4
+
+SUBDIRS = config intl po sigc++ boost src lib
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
 	UPGRADING lyx.man acconfig.h autogen.sh \
-	config development forms images sourcedoc
+	development images sourcedoc
+
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
 
-#ETAGS_ARGS = --language-force=c++
 man_MANS = lyx.1
 
 ## Needed by bindist
-bindistdir=lyxbin
+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\*` ; \
+	cd $(distdir) ; \
 	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find forms -name \*CVS\*` ; \
 	rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
 	ln -s lib/images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
+	rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
 	rm lyx.xpm; exit $$saved_status
 
-
 bindist:
-	mkdir $(bindistdir)
-	if test -f README.bin ; then \
-	  $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
-	fi 
-	$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
-	(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
-	rm -rf $(bindistdir)
-	@if test -f README.bin ; then \
+	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  
+	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: sourcedoc/Doxyfile
 	cd sourcedoc; \
 	doxygen ./Doxyfile
 
-sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
-	cd $(top_builddir) \
-	&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*