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 --git a/.arch-inventory b/.arch-inventory
index 3733b7ed6e3e6ff6318ef6b45c0cbf543a822cdc..5f451d088a33b74d71f990a84fd730c3d5791cac 100644 (file)
--- a/.arch-inventory
+++ b/.arch-inventory
@@ -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 --git a/Makefile.in b/Makefile.in
index 7bfed3fd5ea7f00935c22c4a684983bc08e9be35..28c3ff81b2593f5c6b825d11cbe36d705dea7537 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,7 +259,8 @@ epaths-force: FRC
          -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 @@ bootstrap-clean-before: FRC
        -(cd lispref &&   $(MAKE) $(MFLAGS) clean)
        -(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
        (cd leim;     $(MAKE) $(MFLAGS) clean)
-
-# arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156

diff --git a/etc/.arch-inventory b/etc/.arch-inventory
index 2637a2d3d8e55ccf41c5ce544441f9f3623bd9c6..f242618b2bd8034e80fc32c1085a103988f29674 100644 (file)
--- a/etc/.arch-inventory
+++ b/etc/.arch-inventory
@@ -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 --git a/leim/Makefile.in b/leim/Makefile.in
index 63ba1f54ae2c853b22141b4922661af94f036292..1c13ff0613bee9aa146bb69db447f60c931f545d 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -241,5 +241,3 @@ maintainer-clean: distclean
 
 extraclean: maintainer-clean
        -rm -f *~ \#* m/?*~ s/?*~
-
-# arch-tag: f666a939-8145-4d64-a6a6-cc1f61bd32ca

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 7eea0b41b265eef2a713e5550a5833aac5c6af8a..839d6129a3132bb302ae3327acca366a23c25249 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -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 @@ distclean clean:
 
 maintainer-clean: distclean
        - $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
-
-# arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1da04d88b825e3034991898dccffb2041cc3e28b..1d8c5e6c9ba61cd0e97ac1bee4e538cbde9804a5 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -478,6 +478,3 @@ xveterm${EXEEXT}: ${srcdir}/emacstool.c
        $(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 --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 3b53a29889bf2237ec6496fef44f6192aebc4ffa..663d08e6f13616eed064258adcd6384762b96866 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -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)/timer.$(O) : \
 $(BLD)/yow.$(O) : \
        $(SRC)/yow.c \
        $(EMACS_ROOT)/lib-src/../src/paths.h
-
-# arch-tag: c051bc02-a6de-474b-889a-27f7b2fbbcea

diff --git a/lisp/.arch-inventory b/lisp/.arch-inventory
new file mode 100644 (file)
index 0000000..5341c2d
--- /dev/null
+++ b/lisp/.arch-inventory
@@ -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 --git a/lisp/Makefile.in b/lisp/Makefile.in
index 7bb9a3221cc13dceb8a9d9a77d7cb2238c276498..5085d3b5b912f97a508db457038c4c4a5ea35c03 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -326,5 +326,4 @@ bootstrap-after: finder-data custom-deps
 distclean:
        -rm -f ./Makefile
 
-# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
 # Makefile ends here.

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index fe82e45c04f5e74f6e99e0dd124791773dcd8187..71998d403e455d46462b4a2224ec3d036a2315d7 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -420,5 +420,3 @@ install:
 #
 clean:
                - $(DEL) *~
-
-# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0

diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 14c1b1c9ab906438baca2fc4203dd3b449e890a4..88ac4975010e38aaa87f5d6d22adf4a97ead6b5d 100644 (file)
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -69,5 +69,3 @@ maintainer-clean: distclean
 # 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 --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index a67f262bbc0a90aaa120a075b7e60488ba28ba02..87a8597ccad534469e01c151b2648f3f379c78cc 100644 (file)
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -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 @@ maintainer-clean: distclean
 # 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 --git a/lispref/Makefile.in b/lispref/Makefile.in
index 79be5fc39af626b128081d7d3b25688edff8c793..e9d99de7d6a692d253f28918ed9f7040e3f9f894 100644 (file)
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -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 @@ dist: elisp elisp.dvi
        (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 --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 7d8dd179a56f6e45f89843291a34b8c5d4eed77b..31be34100ccc36d41a61e0c12d937b0e991d3476 100644 (file)
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -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 @@ distclean: clean
 
 maintainer-clean: clean
        - $(DEL) elisp elisp-* elisp.dvi elisp.oaux
-
-# arch-tag: da68f1c2-536d-4d41-9150-7b01434eda3f

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 1e545949ea251cfad5f08928a546b02c7308dc69..11368819f4addb4b430a1aa201ce0245e5b6f373 100644 (file)
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -67,5 +67,3 @@ TAGS:
        ../lib-src/etags $(srcdir)/*.[ch]
 tags: TAGS
 .PHONY: tags
-
-# arch-tag: a881fa74-b56a-44c6-80b4-28a4c65d88ff

diff --git a/man/Makefile.in b/man/Makefile.in
index 99970c3c0ab29cbc61e3a6ae51ed4083d647d7c0..7c2f32e538f3b973347922eb6a01797d71ad9193 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -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 @@ maintainer-clean: distclean
 # 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 --git a/man/makefile.w32-in b/man/makefile.w32-in
index ece0c97175cbb03b1690dd2139fa5ab6b747a1a3..3422f1581988ba53755c7cc4ac7d02460afc65dc 100644 (file)
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -331,5 +331,3 @@ maintainer-clean: distclean
 # 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 --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 6363904108eca2ad561e2bd7a7f937944565139f..adbb3fd57b8f3fc6b9afaa7f57689510ec144406 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.\r
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.\r
 #\r
 #  Top level makefile for building GNU Emacs on Windows NT\r
 #\r
@@ -281,5 +281,3 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
 \r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r
-\r
-# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219\r

diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 82269282c037929d11c5e66486884e2b5830cbdc..e20a583514aa5f853fe254bf15a6d7c4d23b2530 100644 (file)
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -107,5 +107,3 @@ maintainer-clean: distclean
 
 tags::
        $(TAGS) -t *.[ch]
-
-# arch-tag: dbfc0b16-4e0c-4acb-a9c1-fc12ee76db06

diff --git a/src/.arch-inventory b/src/.arch-inventory
index 9f6d601a78803b9a9fed607d376eae39549923ee..99b0d6cc53974cd30daffed3a78ada456b475c93 100644 (file)
--- a/src/.arch-inventory
+++ b/src/.arch-inventory
@@ -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 --git a/src/Makefile.in b/src/Makefile.in
index f24168a5cf5572daf7c92b1cb566ab5ee1164a8c..0d75221acfa33a3717710e9be06bb9801caf9237 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1328,6 +1328,3 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
 #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 --git a/src/makefile.w32-in b/src/makefile.w32-in
index 7056d43af5fcc5a92931dea6d1e823033e5c9520..a7efcc4cae5f28d56b77711ce5f8097f1b357c62 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -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 @@ $(BLD)/w32bdf.$(O): \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
-
-# arch-tag: 9fd7aba8-f826-4111-b3c0-497a8e7db9a0