Fix previous.

[gnu-emacs] / lib-src / makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index e81b2efb529b7cd6b2ba766d4fb4a0da3d4ec9f3..b9292bea2f303a8718c027de62f8608e4cf1bb98 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,30 +1,28 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                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 3, or (at your option)
-#  any later version.
-#
-#  GNU Emacs is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#  Boston, MA 02110-1301, USA.
-#
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+#   2008, 2009 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 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacsclient
 
 .PHONY: $(ALL)
 
-VERSION                = 23.0.60
+VERSION                = 23.0.94
 
 LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
@@ -145,8 +143,8 @@ $(BLD)/ctags.$(O): ctags.c
 #
 obj =   dosfns.o msdos.o \
        xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
-       mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
-       w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
+       fontset.o \
+       w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
        w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
        font.o w32font.o \
        dispnew.o frame.o scroll.o xdisp.o window.o \
@@ -192,10 +190,6 @@ WINDOW_SUPPORT = \
 OTHER_PLATFORM_SUPPORT = \
        $(lispsource)dos-fns.elc \
        $(lispsource)dos-vars.elc \
-       $(lispsource)international/ccl.elc \
-       $(lispsource)international/codepage.elc \
-       $(lispsource)vmsproc.el \
-       $(lispsource)vms-patch.el \
        $(lispsource)x-dnd.elc \
        $(lispsource)term/x-win.elc
 
@@ -266,6 +260,7 @@ lisp2 = \
        $(lispsource)register.elc \
        $(lispsource)replace.elc \
        $(lispsource)simple.elc \
+       $(lispsource)minibuffer.elc \
        $(lispsource)startup.elc \
        $(lispsource)subr.elc \
        $(lispsource)term/tty-colors.elc \
@@ -281,6 +276,7 @@ lisp2 = \
        $(lispsource)jka-cmpr-hook.elc \
        $(lispsource)vc-hooks.elc \
        $(lispsource)ediff-hook.elc \
+       $(lispsource)epa-hook.elc \
        $(TOOLTIP_SUPPORT) \
        $(WINNT_SUPPORT) \
        $(WINDOW_SUPPORT) \
@@ -493,7 +489,7 @@ $(BLD)/sorted-doc.$(O) : \
        $(SRC)/sorted-doc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
+       $(EMACS_ROOT)/src/config.h
 
 $(BLD)/tcp.$(O) : \
        $(SRC)/tcp.c