(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 0edfdf58b0217dcfe0ce88b365f037e2db481735..91a07f246834ac189a6b7371664b16b58f37942a 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -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.
@@ -280,6 +281,7 @@ lisp2 = \
        $(lispsource)jka-cmpr-hook.elc \
        $(lispsource)vc-hooks.elc \
        $(lispsource)ediff-hook.elc \
+       $(lispsource)epa-file-hook.elc \
        $(TOOLTIP_SUPPORT) \
        $(WINNT_SUPPORT) \
        $(WINDOW_SUPPORT) \
@@ -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