* src/window.h (clip_changed): Remove useless declaration.

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 9ea61498ffa41307221902b12be8796a95c76e20..6cb8b3dd4955fbf31a09d952953c0b04ac2cc83a 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2011  Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,9 +27,9 @@ lisp = $(CURDIR)
 srcdir = $(CURDIR)/..
 
 # You can specify a different executable on the make command line,
-# e.g. "make EMACS=../src/emacs ...".
+# e.g. "make EMACS=../bin/emacs ...".
 
-EMACS = $(THISDIR)/../bin/emacs.exe
+EMACS = ../src/$(BLD)/emacs.exe
 
 # Command line flags for Emacs.
 
@@ -84,7 +84,6 @@ BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS)
 COMPILE_FIRST = \
        $(lisp)/emacs-lisp/byte-opt.el \
        $(lisp)/emacs-lisp/bytecomp.el \
-       $(lisp)/emacs-lisp/pcase.el \
        $(lisp)/emacs-lisp/macroexp.el \
        $(lisp)/emacs-lisp/cconv.el \
        $(lisp)/subr.el \
@@ -233,17 +232,20 @@ $(lisp)/subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-       echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
-       echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el
+       echo ;; In load-path, after this directory should come> $(lisp)/subdirs.el
        echo ;; certain of its subdirectories.  Here we specify them.>> $(lisp)/subdirs.el
        echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
        @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el
        echo ))>> $(lisp)/subdirs.el
+       echo ;; Local Variables:>> $(lisp)/subdirs.el
+       echo ;; version-control: never>> $(lisp)/subdirs.el
+       echo ;; no-byte-compile: t>> $(lisp)/subdirs.el
+       echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
-       $(srcdir)/update-subdirs $(lisp); \
+       $(srcdir)/build-aux/update-subdirs $(lisp); \
        for file in $(WINS_SUBDIR); do \
-          $(srcdir)/update-subdirs $$file; \
+          $(srcdir)/build-aux/update-subdirs $$file; \
        done;
 
 updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
@@ -508,9 +510,9 @@ bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
 #
 install:
                - mkdir "$(INSTALL_DIR)/lisp"
-               - $(DEL) ../same-dir.tst
-               - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
-               echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+               - $(DEL) ../$(DIRNAME)_same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
+               echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 #ifdef COPY_LISP_SOURCE
                $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) install-lisp-$(SHELLTYPE) $(ENDIF)
 #else
@@ -526,8 +528,8 @@ install:
 #              $(IFNOTSAMEDIR) $(CP) international/latin-*.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)
 #              $(IFNOTSAMEDIR) $(CP) international/mule-conf.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)
 #endif
-               - $(DEL) ../same-dir.tst
-               - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
+               - $(DEL) ../$(DIRNAME)_same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 
 # Need to copy *.el files first, to avoid "source file is newer" annoyance
 # since cp does not preserve time stamps