# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1086921591 0
# Node ID bb6720f21c542c4be8094f7252666bcb4c6cbb0b
# Parent  3535751dda0993b1c47a72049bd2c36e11678fc6
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396

Tweak arch tagging to make build/install-in-place less annoying

Previously, autoconf-created Makefiles and the like would contain
duplicate taglines (unfortunately, autoconf doesn't seem to have a
`strip in generated file' comment mechanism) leading to conflicts, and
installing in place would create unknown directories and copies of
source directories (leading to conflicts with the source directories).

This changeset makes all autoconf-processed files use explicit id-tags
and adds .arch-inventory entries to ignore installation directories.

diff -r 3535751dda09 -r bb6720f21c54 .arch-inventory
--- a/.arch-inventory	Fri Jun 11 01:04:28 2004 +0000
+++ b/.arch-inventory	Fri Jun 11 02:39:51 2004 +0000
@@ -1,3 +1,9 @@
 precious ^(config\.status)$
 
+# Build-in-place makes these directories, so just ignore them
+precious ^(info)$
+
+# Install-in-place makes these directories, so just ignore them
+backup ^(bin|data|lock|site-lisp)$
+
 # arch-tag: 6eeeaa4e-cc7e-4b22-b3d7-1089e155da14
diff -r 3535751dda09 -r bb6720f21c54 Makefile.in
--- a/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -259,7 +259,8 @@
 	  -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'		\
 	  -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
 	  -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
-	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&		\
+	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
+	  -e 's;/[*] *arch-tag:.*;/*;') &&		\
 	${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be build before leim.
@@ -753,5 +754,3 @@
 	-(cd lispref &&   $(MAKE) $(MFLAGS) clean)
 	-(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
 	(cd leim;     $(MAKE) $(MFLAGS) clean)
-
-# arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156
diff -r 3535751dda09 -r bb6720f21c54 etc/.arch-inventory
--- a/etc/.arch-inventory	Fri Jun 11 01:04:28 2004 +0000
+++ b/etc/.arch-inventory	Fri Jun 11 02:39:51 2004 +0000
@@ -1,4 +1,7 @@
 # Unlike most emacs dirs, etc has a simple non-autoconf-generated makefile
 source ^(Makefile)$
 
+# Install-in-place on NT makes this directory, so just ignore it
+backup ^(icons)$
+
 # arch-tag: 5a1d62e0-593a-48cd-8743-8d45dc58dfae
diff -r 3535751dda09 -r bb6720f21c54 leim/Makefile.in
--- a/leim/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/leim/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -241,5 +241,3 @@
 
 extraclean: maintainer-clean
 	-rm -f *~ \#* m/?*~ s/?*~
-
-# arch-tag: f666a939-8145-4d64-a6a6-cc1f61bd32ca
diff -r 3535751dda09 -r bb6720f21c54 leim/makefile.w32-in
--- a/leim/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/leim/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+# Copyright (C) 1997, 2004 Electrotechnical Laboratory, JAPAN.
 # Licensed to the Free Software Foundation.
 
 # This file is part of GNU Emacs.
@@ -203,5 +203,3 @@
 
 maintainer-clean: distclean
 	- $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
-
-# arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b
diff -r 3535751dda09 -r bb6720f21c54 lib-src/Makefile.in
--- a/lib-src/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lib-src/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -478,6 +478,3 @@
 	$(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
-
-/* arch-tag: cc40144d-fbd2-436b-9a22-dcb5b5b6a2af
-   (do not change this comment) */
diff -r 3535751dda09 -r bb6720f21c54 lib-src/makefile.w32-in
--- a/lib-src/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lib-src/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -425,5 +425,3 @@
 $(BLD)/yow.$(O) : \
 	$(SRC)/yow.c \
 	$(EMACS_ROOT)/lib-src/../src/paths.h
-
-# arch-tag: c051bc02-a6de-474b-889a-27f7b2fbbcea
diff -r 3535751dda09 -r bb6720f21c54 lisp/.arch-inventory
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/.arch-inventory	Fri Jun 11 02:39:51 2004 +0000
@@ -0,0 +1,4 @@
+# Auto-generated lisp files, which ignore
+precious ^(loaddefs|finder-inf|cus-load)\.el$
+
+# arch-tag: fc62dc9f-3a91-455b-b8e7-d49df66beee0
diff -r 3535751dda09 -r bb6720f21c54 lisp/Makefile.in
--- a/lisp/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lisp/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -326,5 +326,4 @@
 distclean:
 	-rm -f ./Makefile
 
-# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
 # Makefile ends here.
diff -r 3535751dda09 -r bb6720f21c54 lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lisp/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -420,5 +420,3 @@
 #
 clean:
 		- $(DEL) *~
-
-# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0
diff -r 3535751dda09 -r bb6720f21c54 lispintro/Makefile.in
--- a/lispintro/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lispintro/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -69,5 +69,3 @@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# arch-tag: eb660994-cd29-4ab8-8043-5042e2dbde84
diff -r 3535751dda09 -r bb6720f21c54 lispintro/makefile.w32-in
--- a/lispintro/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lispintro/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -69,5 +69,3 @@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# arch-tag: d713164a-e683-4ce3-a39e-3bf82f2f82f4
diff -r 3535751dda09 -r bb6720f21c54 lispref/Makefile.in
--- a/lispref/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lispref/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,6 +1,6 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003
+# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003,2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -135,5 +135,3 @@
 	(cd temp/$(manual); rm -f *~)
 	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
 	-rm -rf temp
-
-# arch-tag: f5a1a94d-62e1-4460-a2d1-f02e538ab554
diff -r 3535751dda09 -r bb6720f21c54 lispref/makefile.w32-in
--- a/lispref/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lispref/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003
+# Copyright (C) 2003, 2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -119,5 +119,3 @@
 
 maintainer-clean: clean
 	- $(DEL) elisp elisp-* elisp.dvi elisp.oaux
-
-# arch-tag: da68f1c2-536d-4d41-9150-7b01434eda3f
diff -r 3535751dda09 -r bb6720f21c54 lwlib/Makefile.in
--- a/lwlib/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/lwlib/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -67,5 +67,3 @@
 	../lib-src/etags $(srcdir)/*.[ch]
 tags: TAGS
 .PHONY: tags
-
-# arch-tag: a881fa74-b56a-44c6-80b4-28a4c65d88ff
diff -r 3535751dda09 -r bb6720f21c54 man/Makefile.in
--- a/man/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/man/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,6 +1,6 @@
 #### Makefile for the Emacs Manual and other documentation.
 
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -312,5 +312,3 @@
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 19cdb89e-4acb-448e-b0cc-2ddc05948ee2
diff -r 3535751dda09 -r bb6720f21c54 man/makefile.w32-in
--- a/man/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/man/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -331,5 +331,3 @@
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 6e99da59-ad27-4816-82a0-cde9a101efae
diff -r 3535751dda09 -r bb6720f21c54 nt/makefile.w32-in
--- a/nt/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/nt/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
 #
 #  Top level makefile for building GNU Emacs on Windows NT
 #
@@ -281,5 +281,3 @@
 
 realclean: cleanall
 	- $(DEL_TREE) ../bin
-
-# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219
diff -r 3535751dda09 -r bb6720f21c54 oldXMenu/Makefile.in
--- a/oldXMenu/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/oldXMenu/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -107,5 +107,3 @@
 
 tags::
 	$(TAGS) -t *.[ch]
-
-# arch-tag: dbfc0b16-4e0c-4acb-a9c1-fc12ee76db06
diff -r 3535751dda09 -r bb6720f21c54 src/.arch-inventory
--- a/src/.arch-inventory	Fri Jun 11 01:04:28 2004 +0000
+++ b/src/.arch-inventory	Fri Jun 11 02:39:51 2004 +0000
@@ -1,3 +1,7 @@
+# Source files which don't match the usual naming conventions, mostly dot files
+source ^\.(gdbinit|dbxinit)$
+
+# Auto-generated files, which ignore
 precious ^(config\.stamp|config\.h|epaths\.h)$
 
 # arch-tag: 277cc7ae-b3f5-44af-abf1-84c073164543
diff -r 3535751dda09 -r bb6720f21c54 src/Makefile.in
--- a/src/Makefile.in	Fri Jun 11 01:04:28 2004 +0000
+++ b/src/Makefile.in	Fri Jun 11 02:39:51 2004 +0000
@@ -1328,6 +1328,3 @@
 #endif /* ! defined (HAVE_SHM) */
 	mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */
-
-/* arch-tag: 8e915ae5-d15d-4617-8c41-c5c267a23b00
-   (do not change this comment) */
diff -r 3535751dda09 -r bb6720f21c54 src/makefile.w32-in
--- a/src/makefile.w32-in	Fri Jun 11 01:04:28 2004 +0000
+++ b/src/makefile.w32-in	Fri Jun 11 02:39:51 2004 +0000
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -1471,5 +1471,3 @@
 	$(SRC)/w32bdf.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/w32term.h
-
-# arch-tag: 9fd7aba8-f826-4111-b3c0-497a8e7db9a0