Revert 2008-01-13 change: this is a generated file.

[bpt/emacs.git] / src / makefile.w32-in

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index d9986fb..6f3cab4 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,12 +1,12 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006, 2007 Free Software Foundation, Inc.
+#                2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,
@@ -56,8 +56,7 @@ FULL_LINK_FLAGS      = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 #
 OBJ0 =  $(BLD)/emacs.$(O)
 
-OBJ1 =  $(BLD)/abbrev.$(O)                     \
-       $(BLD)/alloc.$(O)                       \
+OBJ1 =  $(BLD)/alloc.$(O)                      \
        $(BLD)/atimer.$(O)                      \
        $(BLD)/buffer.$(O)                      \
        $(BLD)/bytecode.$(O)                    \
@@ -148,6 +147,7 @@ LIBS =  $(TLIB0)    \
        $(SHELL32)      \
        $(WINSPOOL)     \
        $(OLE32)        \
+       $(COMCTL32)     \
        $(libc)
 
 #
@@ -248,8 +248,10 @@ install:        $(ALL)
 #
 # Maintenance
 #
+# We used to delete *~, s/*~, m/*~ here, but that might inadvertently
+# remove precious files if it happens to match their short 8+3 aliases.
 clean:
-       - $(DEL) *~ "s/*~" "m/*~"
+       - $(DEL) "s/*.h~" "m/*.h~"
        - $(DEL) $(COMPILER_TEMP_FILES)
        - $(DEL_TREE) $(OBJDIR)
        - $(DEL) stamp_BLD
@@ -268,20 +270,6 @@ cleanall:  clean
 EMACS_ROOT     = ..
 SRC            = .
 
-$(BLD)/abbrev.$(O) : \
-       $(SRC)/abbrev.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h \
-       $(SRC)/charset.h \
-       $(SRC)/commands.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/syntax.h \
-       $(SRC)/w32bdf.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
-
 $(BLD)/alloc.$(O) : \
        $(SRC)/alloc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \