(START_FILES, LIB_STANDARD): Adjust value according to HAVE_X86_64_LIB64_DIR.

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

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 4dad03f..931a9d1 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,
@@ -138,7 +138,7 @@ LIBS =  $(TLIB0)    \
        $(TLIB1)        \
        $(TLIBW32)      \
        $(TLASTLIB)     \
-       $(WINMM)    \
+       $(WINMM)        \
        $(ADVAPI32)     \
        $(GDI32)        \
        $(COMDLG32)     \
@@ -146,6 +146,8 @@ LIBS =  $(TLIB0)    \
        $(MPR)          \
        $(SHELL32)      \
        $(WINSPOOL)     \
+       $(OLE32)        \
+       $(COMCTL32)     \
        $(libc)
 
 #
@@ -246,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