diff options
| author | Karoly Lorentey <[email protected]> | 2004-06-11 08:42:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2004-06-11 08:42:19 +0000 |
| commit | 78b29cb3a21f6a4230ebf52edccde7c926a8c69a (patch) | |
| tree | 5cd486b41d2eda1a184c7c73a309bf5ef2699d31 /lib-src | |
| parent | 12828db003f4154515725d1943e22b00690bacce (diff) | |
| parent | 0c2222fafbe829e01a9bb54cb693d6d329644c37 (diff) | |
Merged in changes from CVS trunk.
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-394
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-395
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-396
Tweak arch tagging to make build/install-in-place less annoying
* [email protected]/emacs--cvs-trunk--0--patch-397
Work around vc-arch problems when building eshell
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-197
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/Makefile.in | 3 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 1da04d88b8..1d8c5e6c9b 100644 --- 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 3b53a29889..663d08e6f1 100644 --- 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 |