(emacsclient): Depend also on emacsclientw.exe.

($(BLD)/emacsclientw.exe): New target.
(install): Install emacsclientw.exe.
($(BLD)/cvtmail.$(O), $(BLD)/emacstool.$(O)): Remove obsolete targets.
(ECLIENT_CFLAGS): Remove redundant flags.

1 files changed, 12 insertions, 28 deletions

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 9b26146a575..d5e8e05d810 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -26,13 +26,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
-                  -I../src
-
-# don't know what (if) to do with these yet...
-#
-#               $(BLD)/server.exe       \
-#               $(BLD)/emacstool.exe    \
-#               $(BLD)/cvtmail.exe      \
+                  -I../src
 
 LIBS          = $(BASE_LIBS) $(ADVAPI32)
 
@@ -58,7 +52,7 @@ movemail:	$(BLD) $(BLD)/movemail.exe
 fakemail:       $(BLD) $(BLD)/fakemail.exe
 sorted-doc:     $(BLD) $(BLD)/sorted-doc.exe
 digest-doc:     $(BLD) $(BLD)/digest-doc.exe
-emacsclient:    $(BLD) $(BLD)/emacsclient.exe
+emacsclient:    $(BLD) $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
 
 test-distrib:   $(BLD) $(BLD)/test-distrib.exe
         "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
@@ -74,7 +68,7 @@ $(BLD)/movemail.exe:	$(MOVEMAILOBJS) getopt.h
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
 
-ECLIENT_CFLAGS = -DWINDOWSNT -DHAVE_GETCWD -DHAVE_STRERROR -c
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
 ECLIENTOBJS =   $(BLD)/emacsclient.$(O) \
                 $(BLD)/getopt.$(O) \
                 $(BLD)/getopt1.$(O) \
@@ -84,6 +78,10 @@ $(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) $(LIBS)
 
+$(BLD)/emacsclientw.exe:        $(ECLIENTOBJS)
+# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
+                $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+
 $(BLD)/emacsclient.$(O):        emacsclient.c
                 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
 
@@ -98,9 +96,9 @@ $(BLD)/etags.exe: 	$(ETAGSOBJ)
 
 
 EBROWSEOBJ    = $(BLD)/ebrowse.$(O) \
-                $(BLD)/getopt.$(O) \
-                $(BLD)/getopt1.$(O) \
-                $(BLD)/ntlib.$(O)
+                $(BLD)/getopt.$(O) \
+                $(BLD)/getopt1.$(O) \
+                $(BLD)/ntlib.$(O)
 
 $(BLD)/ebrowse.exe:     $(EBROWSEOBJ)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(EBROWSEOBJ) $(LIBS)
@@ -131,14 +129,6 @@ $(BLD)/ctags.$(O): ctags.c
                 $(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
 
 #
-# don't know what to do with these yet...
-#
-# $(BLD)/emacstool.exe:         $(BLD)/emacstool.$(O)
-# $(BLD)/server.exe:            $(BLD)/server.$(O)
-# $(BLD)/cvtmail.exe:           $(BLD)/cvtmail.$(O)
-# $(BLD)/emacsclient.exe:       $(BLD)/emacsclient.$(O)
-
-#
 # From ..\src\Makefile.in
 # It doesn't matter if the real name is *.obj for the files in this list,
 # make-docfile blindly replaces .o with .c anyway.  Keep .o in this list
@@ -319,6 +309,7 @@ install:	$(INSTALL_FILES)
                 $(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
+                $(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
                 - mkdir "$(INSTALL_DIR)/etc"
                 $(CP) $(DOC) $(INSTALL_DIR)/etc
 
@@ -374,9 +365,6 @@ $(BLD)/ctags.$(O) : \
         $(SRC)/ntlib.h \
         $(SRC)/getopt.h
 
-$(BLD)/cvtmail.$(O) : \
-        $(SRC)/cvtmail.c
-
 $(BLD)/digest-doc.$(O) : \
         $(SRC)/digest-doc.c
 
@@ -386,10 +374,6 @@ $(BLD)/emacsclient.$(O) : \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
 
-$(BLD)/emacstool.$(O) : \
-        $(SRC)/emacstool.c \
-        $(EMACS_ROOT)/nt/inc/sys/file.h
-
 $(BLD)/etags.$(O) : \
         $(SRC)/etags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
@@ -451,7 +435,7 @@ $(BLD)/movemail.$(O) : \
         $(EMACS_ROOT)/lib-src/../src/syswait.h \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(SRC)/ntlib.h
-                $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
+        $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
 
 $(BLD)/ntlib.$(O) : \
         $(SRC)/ntlib.c \