X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/e468b87f91f26e66a8cde087c1a9c89c67b96d12..a69edb8adff6683988ee0b19179dd85c1c35edf0:/lib-src/makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 03ef92f023..552dd1349f 100644
--- 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 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		= 22.1.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 \
@@ -75,18 +73,19 @@ ECLIENTOBJS =	$(BLD)/emacsclient.$(O) \
 		$(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) $(LIBS)
+		$(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) $(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.
@@ -142,22 +141,23 @@ $(BLD)/ctags.$(O): ctags.c
 # make-docfile blindly replaces .o with .c anyway.  Keep .o in this list
 # as it is required by code in doc.c.
 #
-obj =   sunfns.o dosfns.o msdos.o \
-	xterm.o xfns.o xmenu.o xselect.o xrdb.o  fringe.o image.o \
-	mac.o macterm.o macfns.o macmenu.o fontset.o font.o w32font.o \
-	w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
+obj =   dosfns.o msdos.o \
+	xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
+	fontset.o menu.o \
+	w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
 	w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
-	dispnew.o frame.o scroll.o xdisp.o window.o \
-	charset.o coding.o category.o ccl.o \
-	cm.o term.o xfaces.o \
+	font.o w32font.o w32uniscribe.o \
+	dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
+	charset.o coding.o category.o ccl.o character.o chartab.o \
+	cm.o term.o terminal.o xfaces.o \
 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
 	buffer.o filelock.o insdel.o marker.o \
 	minibuf.o fileio.o dired.o filemode.o \
 	cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
 	alloc.o data.o doc.o editfns.o callint.o \
 	eval.o floatfns.o fns.o print.o lread.o \
-	abbrev.o syntax.o bytecode.o \
-	process.o callproc.o \
+	syntax.o bytecode.o \
+	process.o callproc.o unexw32.o \
 	region-cache.o sound.o atimer.o \
 	doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
 
@@ -166,30 +166,58 @@ obj =   sunfns.o dosfns.o msdos.o \
 #
 lispsource = ../lisp/
 
-MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc $(lispsource)mouse.elc $(lispsource)tooltip.elc
-WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc $(lispsource)w32-vars.elc
+MOUSE_SUPPORT = \
+	$(lispsource)select.elc \
+	$(lispsource)scroll-bar.elc \
+	$(lispsource)mouse.elc
+WINNT_SUPPORT = \
+	$(lispsource)ls-lisp.elc \
+	$(lispsource)disp-table.elc \
+	$(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 = \
+	$(lispsource)fringe.elc \
+	$(lispsource)image.elc \
+	$(lispsource)international/fontset.elc \
+	$(lispsource)dnd.elc \
+	$(lispsource)tool-bar.elc \
+	$(lispsource)mwheel.elc
 
 # lisp files that are loaded up on other platforms
-MSDOS_SUPPORT = $(lispsource)dos-fns.elc $(lispsource)dos-vars.elc $(lispsource)international/ccl.elc $(lispsource)international/codepage.elc
-VMS_SUPPORT = $(lispsource)vmsproc.elc $(lispsource)vms-patch.elc
+OTHER_PLATFORM_SUPPORT = \
+	$(lispsource)dos-fns.elc \
+	$(lispsource)dos-vars.elc \
+	$(lispsource)term/internal.elc \
+	$(lispsource)term/pc-win.elc \
+	$(lispsource)x-dnd.elc \
+	$(lispsource)term/x-win.elc \
+	$(lispsource)emacs-lisp/easymenu.elc \
+	$(lispsource)term/ns-win.elc
+
 
 lisp1= \
 	$(lispsource)abbrev.elc \
 	$(lispsource)buff-menu.elc \
 	$(lispsource)button.elc \
 	$(lispsource)emacs-lisp/byte-run.elc \
+	$(lispsource)composite.elc \
 	$(lispsource)cus-face.elc \
 	$(lispsource)cus-start.elc \
 	$(lispsource)custom.elc \
 	$(lispsource)emacs-lisp/backquote.elc \
 	$(lispsource)emacs-lisp/lisp-mode.elc \
 	$(lispsource)emacs-lisp/lisp.elc \
-	$(lispsource)facemenu.elc \
-	$(MOUSE_SUPPORT) \
+	$(lispsource)env.elc \
 	$(lispsource)faces.elc \
 	$(lispsource)files.elc \
-	$(lispsource)emacs-lisp/float-sup.elc \
 	$(lispsource)format.elc \
+	$(lispsource)facemenu.elc \
+	$(MOUSE_SUPPORT) \
+	$(lispsource)emacs-lisp/float-sup.elc \
 	$(lispsource)frame.elc \
 	$(lispsource)help.elc \
 	$(lispsource)indent.elc \
@@ -199,27 +227,19 @@ lisp1= \
 	$(lispsource)loaddefs.el \
 	$(lispsource)bindings.elc \
 	$(lispsource)emacs-lisp/map-ynp.elc \
-	$(lispsource)env.elc \
+	$(lispsource)menu-bar.elc \
 	$(lispsource)international/mule.elc \
 	$(lispsource)international/mule-conf.el \
 	$(lispsource)international/mule-cmds.elc \
 	$(lispsource)international/characters.elc \
-	$(lispsource)fringe.elc \
-	$(lispsource)image.elc \
-	$(lispsource)international/fontset.elc \
-	$(lispsource)dnd.elc \
-	$(lispsource)mwheel.elc \
-	$(lispsource)tool-bar.elc \
+	$(lispsource)international/charprop.el \
 	$(lispsource)case-table.elc
 
 lisp2 = \
-	$(lispsource)language/chinese.elc \
-	$(lispsource)language/cyrillic.elc \
-	$(lispsource)language/indian.elc \
-	$(lispsource)language/devanagari.el \
-	$(lispsource)language/kannada.el \
-	$(lispsource)language/malayalam.el \
-	$(lispsource)language/tamil.el \
+	$(lispsource)language/chinese.el \
+	$(lispsource)language/cyrillic.el \
+	$(lispsource)language/indian.el \
+	$(lispsource)language/sinhala.el \
 	$(lispsource)language/english.el \
 	$(lispsource)language/ethiopic.elc \
 	$(lispsource)language/european.elc \
@@ -227,21 +247,25 @@ lisp2 = \
 	$(lispsource)language/slovak.el \
 	$(lispsource)language/romanian.el \
 	$(lispsource)language/greek.el \
-	$(lispsource)language/hebrew.el \
+	$(lispsource)language/hebrew.elc \
 	$(lispsource)language/japanese.el \
 	$(lispsource)language/korean.el \
 	$(lispsource)language/lao.el \
+	$(lispsource)language/cham.el \
+	$(lispsource)language/tai-viet.el \
 	$(lispsource)language/thai.el \
 	$(lispsource)language/tibetan.elc \
-	$(lispsource)language/vietnamese.elc \
+	$(lispsource)language/vietnamese.el \
 	$(lispsource)language/misc-lang.el \
 	$(lispsource)language/utf-8-lang.el \
 	$(lispsource)language/georgian.el \
-	$(lispsource)menu-bar.elc \
+	$(lispsource)language/khmer.el \
+	$(lispsource)language/burmese.el \
 	$(lispsource)paths.el \
 	$(lispsource)register.elc \
 	$(lispsource)replace.elc \
 	$(lispsource)simple.elc \
+	$(lispsource)minibuffer.elc \
 	$(lispsource)startup.elc \
 	$(lispsource)subr.elc \
 	$(lispsource)term/tty-colors.elc \
@@ -254,16 +278,22 @@ lisp2 = \
 	$(lispsource)textmodes/paragraphs.elc \
 	$(lispsource)textmodes/text-mode.elc \
 	$(lispsource)emacs-lisp/timer.elc \
-	$(lispsource)vc-hooks.elc \
 	$(lispsource)jka-cmpr-hook.elc \
-	$(lispsource)ediff-hook.elc \
-	$(VMS_SUPPORT) \
-	$(MSDOS_SUPPORT) \
+	$(lispsource)vc/vc-hooks.elc \
+	$(lispsource)vc/ediff-hook.elc \
+	$(lispsource)epa-hook.elc \
+	$(TOOLTIP_SUPPORT) \
 	$(WINNT_SUPPORT) \
+	$(WINDOW_SUPPORT) \
 	$(lispsource)widget.elc \
 	$(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.
@@ -275,11 +305,12 @@ lisp2 = \
 	- $(DEL) temacs.exe
 
 DOC	      = DOC
-$(DOC):		stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
+$(DOC):		stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) $(OTHER_PLATFORM_SUPPORT)
 		- $(DEL) $(DOC)
 		"$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj)
 		"$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
 		"$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2)
+		"$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT)
 		$(CP) $(DOC) ../etc/DOC-X
 		- mkdir "../src/$(OBJDIR)"
 		- mkdir "../src/$(OBJDIR)/etc"
@@ -322,6 +353,13 @@ clean:
 		- $(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
@@ -333,6 +371,7 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:	../nt/$(CONFIG_H)
+			$(DEL) $@
 			echo $(CONFIG_H) has changed.  Re-run configure.bat.
 			exit -1
 
@@ -462,7 +501,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