(x_draw_image_glyph_string): Adjust stipple origin when

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

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 6906230..6611efb 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 Free Software Foundation, Inc.
+#                2005, 2006, 2007 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,7 @@ LIBS =  $(TLIB0)    \
        $(MPR)          \
        $(SHELL32)      \
        $(WINSPOOL)     \
+       $(OLE32)        \
        $(libc)
 
 #
@@ -210,8 +211,8 @@ bootstrap-clean:
 # The resource file.  NT 3.10 requires the use of cvtres; even though
 # it is not necessary on later versions, it is still ok to use it.
 #
-$(TRES): ../nt/emacs.rc
-       $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)
+$(TRES): ../nt/emacs.rc stamp_BLD
+       $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ ../nt/emacs.rc
 
 #
 # Build the library.  Split up the build into two phases...otherwise we
@@ -246,11 +247,13 @@ 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
+       - $(DEL) stamp_BLD
 
 distclean:     clean
        - $(DEL) config.h epaths.h
@@ -1491,4 +1494,4 @@ $(BLD)/w32bdf.$(O): \
 # Each object file depends on stamp_BLD, because in parallel builds we must
 # make sure $(BLD) exists before starting compilations.
 #
-$(OBJ0) $(OBJ1) $(WIN32OBJ) lastfile.$(O): stamp_BLD
+$(OBJ0) $(OBJ1) $(WIN32OBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD