[Emacs-diffs] Changes to emacs/lib-src/makefile.w32-in,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/10/31 00:19:38

Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/makefile.w32-in,v
retrieving revision 2.46
retrieving revision 2.47
diff -u -b -r2.46 -r2.47
--- makefile.w32-in     9 Oct 2006 19:57:43 -0000       2.46
+++ makefile.w32-in     31 Oct 2006 00:19:38 -0000      2.47
@@ -20,7 +20,7 @@
 #  Boston, MA 02110-1301, USA.
 #
 
-ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc
+ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc 
emacsclient
 
 .PHONY: $(ALL)
 
@@ -32,7 +32,6 @@
 #
 #              $(BLD)/server.exe       \
 #              $(BLD)/emacstool.exe    \
-#              $(BLD)/emacsclient.exe  \
 #              $(BLD)/cvtmail.exe      \
 
 LIBS         = $(BASE_LIBS) $(ADVAPI32)
@@ -59,6 +58,7 @@
 fakemail:      $(BLD) $(BLD)/fakemail.exe
 sorted-doc:    $(BLD) $(BLD)/sorted-doc.exe
 digest-doc:    $(BLD) $(BLD)/digest-doc.exe
+emacsclient:   $(BLD) $(BLD)/emacsclient.exe
 
 test-distrib:  $(BLD) $(BLD)/test-distrib.exe
        "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
@@ -74,6 +74,19 @@
 # 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
+ECLIENTOBJS =  $(BLD)/emacsclient.$(O) \
+               $(BLD)/getopt.$(O) \
+               $(BLD)/getopt1.$(O) \
+               $(BLD)/ntlib.$(O)
+
+$(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)/emacsclient.$(O):       emacsclient.c
+               $(CC) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
+
 ETAGSOBJ      = $(BLD)/etags.$(O) \
                $(BLD)/getopt.$(O) \
                $(BLD)/getopt1.$(O) \
@@ -296,6 +309,7 @@
                $(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
                $(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin
                $(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin
+               $(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
                - mkdir "$(INSTALL_DIR)/etc"
                $(CP) $(DOC) $(INSTALL_DIR)/etc