uniquify files passed to etags

diff --git a/ChangeLog b/ChangeLog
index abeef9931ff1434affd3b483b675d2abf5b21b81..6e5ebc2ef8d1b21d99d1a8ef9a31504024e24a04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Thu Feb 12 22:27:05 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * tags.am (TAGS): Uniquify list of files.  From Harlan Stenn.
+
        * aclocal.in (scan_m4_files): Reverse-sort keys when constructing
        `search' function.  From Johan Danielsson.
 

diff --git a/Makefile.in b/Makefile.in
index 39233a407d8924c638d14f221e8158781eb0f3c6..c02a011143ff62a4e5c11d719f35c30f58a4f59f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.2d from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -100,10 +100,10 @@ TEXINFOS = automake.texi
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
-ansi2knr.c automake.in config.guess config.sub configure configure.in \
-elisp-comp install-sh mdate-sh missing mkinstalldirs stamp-vti \
-texinfo.tex version.texi ylwrap
+Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
+ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
+configure.in elisp-comp install-sh mdate-sh missing mkinstalldirs \
+stamp-vti texinfo.tex version.texi ylwrap
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -360,8 +360,12 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) $(LISP) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$i] = 1; } \
+              END { for (i in files) print $$i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -405,6 +409,10 @@ dist-all: distdir
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
        -rm -rf $(distdir)
 distdir: $(DISTFILES)
+       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+         echo "NEWS not updated; not releasing" 1>&2; \
+         exit 1; \
+       fi
        -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)

diff --git a/lib/am/tags.am b/lib/am/tags.am
index ab23dbc2c00f3bc4bc8c6952df7474a712ac0bb7..1777fa2c998eb9ae901eb9851f19c88acd17324c 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -27,6 +27,11 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) $(LISP)
 SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
 SUBDIRS          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 SUBDIRS        done; \
+## Make sure the list of sources is unique.
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
-       test -z "$(ETAGS_ARGS)@CONFIG@$(SOURCES)$(HEADERS)$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $(SOURCES) $(HEADERS) $(LISP) -o $$here/TAGS)
+       test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) -o $$here/TAGS)

diff --git a/m4/Makefile.in b/m4/Makefile.in
index ba4bc06dd22b1c23e638bfec463591e7a21e0dc8..77c5a75e2033a35eb58f2bf33642ca891af48d0e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.2d from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/tags.am b/tags.am
index ab23dbc2c00f3bc4bc8c6952df7474a712ac0bb7..1777fa2c998eb9ae901eb9851f19c88acd17324c 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -27,6 +27,11 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) $(LISP)
 SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
 SUBDIRS          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 SUBDIRS        done; \
+## Make sure the list of sources is unique.
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
-       test -z "$(ETAGS_ARGS)@CONFIG@$(SOURCES)$(HEADERS)$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $(SOURCES) $(HEADERS) $(LISP) -o $$here/TAGS)
+       test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) -o $$here/TAGS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5ddf8b748f08acb065e446b2c3e5e8d657dec584..d28c408a79a89dff3946c79021b6c3e6b389c533 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.2d from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.