From: Alexandre Duret-Lutz Date: Thu, 26 Jun 2003 23:54:07 +0000 (+0000) Subject: * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ... X-Git-Tag: Release-1-7b~150 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c645bbc8b3a648d21a8ca54b300ca084e91e6494;p=thirdparty%2Fautomake.git * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ... ($(top_srcdir)/m4/amversion.m4): ... this. (DISTCLEANFILES): Remove. (nodist_m4data_DATA): Remove. amversion.m4 is automatically distributed. (EXTRA_DIST): Add amversion.in. --- diff --git a/ChangeLog b/ChangeLog index 3a8aaa0b3..1725b6c1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-06-27 Alexandre Duret-Lutz + + * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ... + ($(top_srcdir)/m4/amversion.m4): ... this. + (DISTCLEANFILES): Remove. + (nodist_m4data_DATA): Remove. amversion.m4 is automatically + distributed. + (EXTRA_DIST): Add amversion.in. + 2003-06-25 Akim Demaille * automake.texi (Top): Use @copying and @insertcopying. diff --git a/m4/Makefile.am b/m4/Makefile.am index 046a8212f..fd836f0a5 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -53,18 +53,16 @@ runlog.m4 \ sanity.m4 \ strip.m4 -# Use `$(srcdir)' for the benefit of non-GNU makes. -# Many implementations do not know that `./foo' is the same target as `foo'. -nodist_m4data_DATA = $(srcdir)/amversion.m4 -DISTCLEANFILES = amversion.m4 -EXTRA_DIST = dirlist +EXTRA_DIST = dirlist amversion.in # We build amversion.m4 here, instead of from config.status, # because config.status is rerun each time one of configure's # dependencies change and amversion.m4 happens to be a configure # dependency. configure and amversion.m4 would be rebuilt in # loop otherwise. -$(srcdir)/amversion.m4: $(srcdir)/amversion.in +# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is +# how amversion.m4 appears in our dependencies. +$(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in sed -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ $(srcdir)/amversion.in > $@t diff --git a/m4/Makefile.in b/m4/Makefile.in index f8d3086a7..69be49bee 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -49,10 +49,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(m4datadir) $(DESTDIR)$(m4datadir) +am__installdirs = $(DESTDIR)$(m4datadir) dist_m4dataDATA_INSTALL = $(INSTALL_DATA) -nodist_m4dataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_m4data_DATA) $(nodist_m4data_DATA) +DATA = $(dist_m4data_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -149,12 +148,7 @@ runlog.m4 \ sanity.m4 \ strip.m4 - -# Use `$(srcdir)' for the benefit of non-GNU makes. -# Many implementations do not know that `./foo' is the same target as `foo'. -nodist_m4data_DATA = $(srcdir)/amversion.m4 -DISTCLEANFILES = amversion.m4 -EXTRA_DIST = dirlist +EXTRA_DIST = dirlist amversion.in all: all-am .SUFFIXES: @@ -204,23 +198,6 @@ uninstall-dist_m4dataDATA: echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ rm -f $(DESTDIR)$(m4datadir)/$$f; \ done -install-nodist_m4dataDATA: $(nodist_m4data_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(m4datadir) - @list='$(nodist_m4data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ - $(nodist_m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ - done - -uninstall-nodist_m4dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(nodist_m4data_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ - rm -f $(DESTDIR)$(m4datadir)/$$f; \ - done tags: TAGS TAGS: @@ -260,7 +237,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - $(mkinstalldirs) $(DESTDIR)$(m4datadir) $(DESTDIR)$(m4datadir) + $(mkinstalldirs) $(DESTDIR)$(m4datadir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -281,7 +258,6 @@ clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -304,7 +280,7 @@ info: info-am info-am: -install-data-am: install-dist_m4dataDATA install-nodist_m4dataDATA +install-data-am: install-dist_m4dataDATA install-exec-am: @@ -330,20 +306,17 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \ - uninstall-nodist_m4dataDATA +uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ install-dist_m4dataDATA install-exec install-exec-am \ - install-info install-info-am install-man \ - install-nodist_m4dataDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_m4dataDATA uninstall-info-am \ - uninstall-nodist_m4dataDATA + uninstall-dist_m4dataDATA uninstall-info-am # We build amversion.m4 here, instead of from config.status, @@ -351,7 +324,9 @@ uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \ # dependencies change and amversion.m4 happens to be a configure # dependency. configure and amversion.m4 would be rebuilt in # loop otherwise. -$(srcdir)/amversion.m4: $(srcdir)/amversion.in +# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is +# how amversion.m4 appears in our dependencies. +$(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in sed -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ $(srcdir)/amversion.in > $@t diff --git a/stamp-vti b/stamp-vti index 49de9798c..f09acd167 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 25 June 2003 +@set UPDATED 27 June 2003 @set UPDATED-MONTH June 2003 @set EDITION 1.7a @set VERSION 1.7a diff --git a/version.texi b/version.texi index 49de9798c..f09acd167 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 25 June 2003 +@set UPDATED 27 June 2003 @set UPDATED-MONTH June 2003 @set EDITION 1.7a @set VERSION 1.7a