(json-alist-p, json-plist-p): Don't use `iff' in docstrings.

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

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 190a293984c657bee2a5f45c2399e42240d28961..91a07f246834ac189a6b7371664b16b58f37942a 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006, 2007 Free Software Foundation, Inc.
+#                2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION                = 23.0.50
+VERSION                = 23.0.60
 
 LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
@@ -75,18 +75,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) $(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.
@@ -142,7 +143,7 @@ $(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 \
+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 \
@@ -157,7 +158,7 @@ obj =   sunfns.o dosfns.o msdos.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 \
+       syntax.o bytecode.o \
        process.o callproc.o \
        region-cache.o sound.o atimer.o \
        doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
@@ -170,8 +171,7 @@ lispsource = ../lisp/
 MOUSE_SUPPORT = \
        $(lispsource)select.elc \
        $(lispsource)scroll-bar.elc \
-       $(lispsource)mouse.elc \
-       $(lispsource)tooltip.elc
+       $(lispsource)mouse.elc
 WINNT_SUPPORT = \
        $(lispsource)ls-lisp.elc \
        $(lispsource)disp-table.elc \
@@ -179,16 +179,6 @@ WINNT_SUPPORT = \
        $(lispsource)dos-w32.elc \
        $(lispsource)w32-vars.elc \
        $(lispsource)term/w32-win.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
 TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
 WINDOW_SUPPORT = \
        $(lispsource)fringe.elc \
@@ -198,12 +188,24 @@ WINDOW_SUPPORT = \
        $(lispsource)tool-bar.elc \
        $(lispsource)mwheel.elc
 
+# lisp files that are loaded up on other platforms
+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
+
+
 lisp1= \
        $(lispsource)abbrev.elc \
        $(lispsource)buff-menu.elc \
        $(lispsource)button.elc \
        $(lispsource)emacs-lisp/byte-run.elc \
-       ${lispsource}composite.elc \
+       $(lispsource)composite.elc \
        $(lispsource)cus-face.elc \
        $(lispsource)cus-start.elc \
        $(lispsource)custom.elc \
@@ -238,10 +240,7 @@ lisp2 = \
        $(lispsource)language/chinese.el \
        $(lispsource)language/cyrillic.el \
        $(lispsource)language/indian.el \
-       $(lispsource)language/devanagari.el \
-       $(lispsource)language/kannada.el \
-       $(lispsource)language/malayalam.el \
-       $(lispsource)language/tamil.el \
+       $(lispsource)language/sinhala.el \
        $(lispsource)language/english.el \
        $(lispsource)language/ethiopic.elc \
        $(lispsource)language/european.elc \
@@ -253,6 +252,7 @@ lisp2 = \
        $(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 \
@@ -260,6 +260,8 @@ lisp2 = \
        $(lispsource)language/misc-lang.el \
        $(lispsource)language/utf-8-lang.el \
        $(lispsource)language/georgian.el \
+       $(lispsource)language/khmer.el \
+       $(lispsource)language/burmese.el \
        $(lispsource)paths.el \
        $(lispsource)register.elc \
        $(lispsource)replace.elc \
@@ -279,9 +281,8 @@ lisp2 = \
        $(lispsource)jka-cmpr-hook.elc \
        $(lispsource)vc-hooks.elc \
        $(lispsource)ediff-hook.elc \
+       $(lispsource)epa-file-hook.elc \
        $(TOOLTIP_SUPPORT) \
-       $(VMS_SUPPORT) \
-       $(MSDOS_SUPPORT) \
        $(WINNT_SUPPORT) \
        $(WINDOW_SUPPORT) \
        $(lispsource)widget.elc \
@@ -299,11 +300,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"
@@ -347,6 +349,12 @@ clean:
                - $(DEL_TREE) $(OBJDIR)
                - $(DEL) stamp_BLD
 
+distclean: cleanall
+       - $(DEL) TAGS
+       - $(DEL) Makefile
+
+maintainer-clean: distclean
+
 cleanall:      clean
                - $(DEL_TREE) obj
                - $(DEL_TREE) obj-spd