From 002e08b17cac12266464770f5d79162f34b83d49 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Tue, 8 Jan 2002 18:24:41 +0000 Subject: [PATCH] Added target "dist" and "sane-frontends". make dist creates sane-frontends-x.y.z.tar.gz and make sane-frontends also creates the appropriate sane-x-y-z.lsm. Moved distclean to include/. Fixed .PHONY. --- Changelog | 4 ++++ Makefile.in | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Changelog b/Changelog index c7431c9..67c7a00 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,10 @@ from root dir. * doc/Makefile.in lib/Makefile.in sanei/Makefile.in src/Makefile.in: Fixed .PHONY. Added target "dist". + * Makefile.in: Added target "dist" and "sane-frontends". make dist + creates sane-frontends-x.y.z.tar.gz and make sane-frontends also + creates the appropriate sane-x-y-z.lsm. Moved distclean to include/. + Fixed .PHONY. 2002-01-08 Oliver Rauch diff --git a/Makefile.in b/Makefile.in index d7280a4..cd87a03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,6 +7,7 @@ top_builddir = . PACKAGE = @PACKAGE@ VERSION = @VERSION@ +distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION) prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -32,7 +33,15 @@ INSTALL_DATA = @INSTALL_DATA@ @SET_MAKE@ -SUBDIRS = lib sanei src doc +SUBDIRS = include lib sanei src doc + +DISTFILES = AUTHORS COPYING Changelog INSTALL Makefile.in NEWS PROBLEMS \ + README TODO aclocal.m4 config.guess config.sub configure configure.in \ + install-sh mkinstalldirs sane-frontends.lsm + +.PHONY: all all-recursive clean clean-recursive depend \ + depend-recursive dist install install-recursive lsm sane-frontends \ + uninstall uninstall-recursive all: all-recursive @@ -44,7 +53,8 @@ $(PACKAGE)-$(VERSION).lsm: $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).lsm -e "s|_L_S_|`find $(PACKAGE).lsm -printf "%3k"`|g" > \ $(PACKAGE)-$(VERSION).lsm \ ) -lsm: $(PACKAGE)-$(VERSION).lsm + +lsm: $(PACKAGE)-$(VERSION).lsm dist install: install-recursive @@ -53,8 +63,8 @@ uninstall: uninstall-recursive clean: clean-recursive distclean: clean distclean-recursive - rm -f *~ include/*~ include/sane/*~ *.log *.bak libtool - rm -f include/sane/config.h Makefile config.cache config.status + rm -f *~ *.log *.bak libtool + rm -f Makefile config.cache config.status rm -f intl/Makefile depend: depend-recursive @@ -68,6 +78,20 @@ distclean-recursive depend-recursive: || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" -.PHONY: all clean depend \ - all-recursive install-recursive clean-recursive depend-recursive \ - uninstall-recursive + +dist: $(DISTFILES) + rm -fr $(distdir) + $(MKDIR) $(distdir) + for file in $(DISTFILES); do \ + ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \ + done + for subdir in $(SUBDIRS) ; do \ + mkdir $(distdir)/$$subdir || exit 1; \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ + done + tar chzf $(distdir).tar.gz $(distdir) + rm -fr $(distdir) + +$(PACKAGE)-$(VERSION).tar.gz: dist + +sane-frontends: dist lsm