Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu

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

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 655d888..59da034 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 #
 # Top level makefile for building GNU Emacs on Windows NT
 #
@@ -22,13 +22,15 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
 #        (and remove or replace this comment).
 
-VERSION                = 24.3.50
+VERSION                = 24.4.50
 
 TMP_DIST_DIR   = emacs-$(VERSION)
 
 TRES           = $(BLD)/emacs.res
 CLIENTRES      = $(BLD)/emacsclient.res
 
+LOCAL_FLAGS    = -DOLD_PATHS=1
+
 XMFLAGS                =
 
 ALL            = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
@@ -85,7 +87,7 @@ all:  which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
 
 all-other-dirs-$(MAKETYPE): maybe-bootstrap
 
-all-other-dirs-nmake: addsection
+all-other-dirs-nmake: $(BLD)/addsection.exe
        cd ..\lib
        $(MAKE) $(MFLAGS) all
        cd ..\lib-src
@@ -98,7 +100,7 @@ all-other-dirs-nmake: addsection
        $(MAKE) $(MFLAGS) all
        cd ..\nt
 
-all-other-dirs-gmake: addsection
+all-other-dirs-gmake: $(BLD)/addsection.exe
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
@@ -145,10 +147,10 @@ maybe-bootstrap-SH: doit
 
 # Bootstrap depends on cmdproxy because some Lisp functions
 # loaded during bootstrap may need to run shell commands.
-bootstrap:     addsection cmdproxy bootstrap-$(MAKETYPE)
+bootstrap:     $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
        $(MAKE) $(MFLAGS) $(XMFLAGS) all
 
-bootstrap-nmake: addsection cmdproxy
+bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
        cd ..\lisp
        $(MAKE) $(MFLAGS) bootstrap-clean
        cd ..\src
@@ -168,7 +170,7 @@ bootstrap-nmake: addsection cmdproxy
        $(MAKE) $(MFLAGS) DOC
        cd ..\nt
 
-bootstrap-gmake: addsection cmdproxy
+bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
@@ -249,7 +251,7 @@ install-other-dirs-gmake: all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
-install-addpm: $(INSTALL_DIR)/bin addpm
+install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
 
 install-shortcuts: install-addpm
@@ -313,7 +315,7 @@ clean:      clean-other-dirs-$(MAKETYPE)
        - $(DEL) $(COMPILER_TEMP_FILES)
        - $(DEL_TREE) $(OBJDIR)
        - $(DEL) stamp_BLD
-       - $(DEL) ../etc/DOC ../etc/DOC-X
+       - $(DEL) ../etc/DOC
 
 clean-other-dirs-nmake:
        cd ..\lib
@@ -373,7 +375,7 @@ top-distclean:
        - $(DEL_TREE) oo
        - $(DEL_TREE) oo-spd
        - $(DEL) stamp_BLD
-       - $(DEL) ../etc/DOC ../etc/DOC-X
+       - $(DEL) ../etc/DOC
        - $(DEL) config.log Makefile
        - $(DEL) ../README.W32