# -*- 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, 2010 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.50
+VERSION = 24.0.50
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
$(BLD)/getopt.$(O) \
$(BLD)/getopt1.$(O) \
$(BLD)/ntlib.$(O)
-TRES = ../nt/$(BLD)/emacs.res
+CLIENTRES = ../nt/$(BLD)/emacsclient.res
-$(TRES): ../nt/emacs.rc
- $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
+$(CLIENTRES): ../nt/emacsclient.rc
+ @echo Emacsclient resource file must be built from nt directory
+ @exit -1
$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
-$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
+$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
- $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+ $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
#
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 \
$(lispsource)w32-fns.elc \
$(lispsource)dos-w32.elc \
$(lispsource)w32-vars.elc \
+ $(lispsource)term/common-win.elc \
$(lispsource)term/w32-win.elc
TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
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)term/internal.elc \
+ $(lispsource)term/pc-win.elc \
$(lispsource)x-dnd.elc \
- $(lispsource)term/x-win.elc
+ $(lispsource)term/x-win.elc \
+ $(lispsource)emacs-lisp/easymenu.elc \
+ $(lispsource)term/ns-win.elc
lisp1= \
$(lispsource)register.elc \
$(lispsource)replace.elc \
$(lispsource)simple.elc \
+ $(lispsource)minibuffer.elc \
$(lispsource)startup.elc \
$(lispsource)subr.elc \
$(lispsource)term/tty-colors.elc \
$(lispsource)textmodes/text-mode.elc \
$(lispsource)emacs-lisp/timer.elc \
$(lispsource)jka-cmpr-hook.elc \
- $(lispsource)vc-hooks.elc \
- $(lispsource)ediff-hook.elc \
+ $(lispsource)vc/vc-hooks.elc \
+ $(lispsource)vc/ediff-hook.elc \
+ $(lispsource)epa-hook.elc \
$(TOOLTIP_SUPPORT) \
$(WINNT_SUPPORT) \
$(WINDOW_SUPPORT) \
$(lispsource)window.elc \
$(lispsource)version.el
+# Used by batch-update-autoloads.
+echolisp:
+ @echo $(lisp1)
+ @echo $(lisp2)
+
# This is needed the first time we build the tree, since temacs.exe
# does not exist yet, and the DOC rule needs it to rebuild DOC whenever
# Emacs is rebuilt.
- $(DEL) getopt.h
- $(DEL_TREE) $(OBJDIR)
- $(DEL) stamp_BLD
+ - $(DEL) echolisp.tmp
+
+distclean: cleanall
+ - $(DEL) TAGS
+ - $(DEL) Makefile
+
+maintainer-clean: distclean
cleanall: clean
- $(DEL_TREE) obj
$(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