Merged in changes from CVS trunk. Plus added lisp/term tweaks.

Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
   Add CVS metadata files.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
   Update from CVS.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393

1 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index d8e8c205b3b..bfda0f25d5f 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#                2005 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -286,6 +287,7 @@ install:	$(INSTALL_FILES)
 clean:
                 - $(DEL) *~ DOC* $(COMPILER_TEMP_FILES)
                 - $(DEL) ctags.c
+                - $(DEL) getopt.h
                 - $(DEL_TREE) $(OBJDIR)
 
 cleanall:       clean
@@ -301,6 +303,8 @@ cleanall:	clean
                         $(CP) $(ALL_DEPS) $@
 ../src/paths.h:         ../nt/paths.h
                         $(CP) $(ALL_DEPS) $@
+getopt.h:               getopt_.h
+                        $(CP) $(ALL_DEPS) $@
 
 ### DEPENDENCIES ###