Commit 48d67035 authored by Miles Bader's avatar Miles Bader

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.
parent e9efcef4
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
......@@ -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
# 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
......@@ -241,5 +241,3 @@ maintainer-clean: distclean
extraclean: maintainer-clean
-rm -f *~ \#* m/?*~ s/?*~
# arch-tag: f666a939-8145-4d64-a6a6-cc1f61bd32ca
# -*- 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
......@@ -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) */
# -*- 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
# Auto-generated lisp files, which ignore
precious ^(loaddefs|finder-inf|cus-load)\.el$
# arch-tag: fc62dc9f-3a91-455b-b8e7-d49df66beee0
......@@ -326,5 +326,4 @@ bootstrap-after: finder-data custom-deps
distclean:
-rm -f ./Makefile
# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
# Makefile ends here.
......@@ -420,5 +420,3 @@ install:
#
clean:
- $(DEL) *~
# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0
......@@ -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
#### -*- 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
# 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
# -*- 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
......@@ -67,5 +67,3 @@ TAGS:
../lib-src/etags $(srcdir)/*.[ch]
tags: TAGS
.PHONY: tags
# arch-tag: a881fa74-b56a-44c6-80b4-28a4c65d88ff
#### 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
......@@ -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
# -*- 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 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
realclean: cleanall
- $(DEL_TREE) ../bin
# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219
......@@ -107,5 +107,3 @@ maintainer-clean: distclean
tags::
$(TAGS) -t *.[ch]
# arch-tag: dbfc0b16-4e0c-4acb-a9c1-fc12ee76db06
# 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
......@@ -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) */
# -*- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment