($(BLD)/emacsclient.$(O)): Use CFLAGS.

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

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index ded72dd0c18b70ae049472afd24a1dcb1be85e3a..9b26146a5750e7dfd95d2e03618bbe7c263664b8 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 Free Software Foundation, Inc.
+#                2005, 2006 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -20,7 +20,7 @@
 #  Boston, MA 02110-1301, USA.
 #
 
-ALL          = make-docfile hexl ctags etags movemail ebrowse
+ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacsclient
 
 .PHONY: $(ALL)
 
@@ -30,15 +30,9 @@ LOCAL_FLAGS  = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 
 # don't know what (if) to do with these yet...
 #
-#              $(BLD)/sorted-doc.exe   \
-#              $(BLD)/env.exe          \
 #              $(BLD)/server.exe       \
 #              $(BLD)/emacstool.exe    \
-#              $(BLD)/leditcfns.exe    \
-#              $(BLD)/emacsclient.exe  \
 #              $(BLD)/cvtmail.exe      \
-#              $(BLD)/digest-doc.exe   \
-#              $(BLD)/test-distrib.exe \
 
 LIBS         = $(BASE_LIBS) $(ADVAPI32)
 
@@ -48,6 +42,12 @@ $(BLD)/hexl.exe:             $(BLD)/hexl.$(O)
                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
 $(BLD)/fakemail.exe:           $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O)
                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS)
+$(BLD)/sorted-doc.exe:         $(BLD)/sorted-doc.$(O)
+               $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/sorted-doc.$(O) $(LIBS)
+$(BLD)/digest-doc.exe:         $(BLD)/digest-doc.$(O)
+               $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/digest-doc.$(O) $(LIBS)
+$(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
+               $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
 
 make-docfile:  $(BLD) $(BLD)/make-docfile.exe
 ctags:         $(BLD) $(BLD)/ctags.exe
@@ -56,6 +56,12 @@ ebrowse:        $(BLD) $(BLD)/ebrowse.exe
 hexl:          $(BLD) $(BLD)/hexl.exe
 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
+
+test-distrib:  $(BLD) $(BLD)/test-distrib.exe
+       "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
 
 GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O)
 GETOPTDEPS = $(GETOPTOBJS) getopt.h
@@ -68,6 +74,19 @@ $(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
+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) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
+
 ETAGSOBJ      = $(BLD)/etags.$(O) \
                $(BLD)/getopt.$(O) \
                $(BLD)/getopt1.$(O) \
@@ -114,15 +133,10 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # don't know what to do with these yet...
 #
-# $(BLD)/sorted-doc.exe:       $(BLD)/sorted-doc.$(O)
-# $(BLD)/yow.exe:              $(BLD)/yow.$(O)
 # $(BLD)/emacstool.exe:        $(BLD)/emacstool.$(O)
-# $(BLD)/leditcfns.exe:        $(BLD)/leditcfns.$(O)
 # $(BLD)/server.exe:           $(BLD)/server.$(O)
 # $(BLD)/cvtmail.exe:          $(BLD)/cvtmail.$(O)
-# $(BLD)/digest-doc.exe:       $(BLD)/digest-doc.$(O)
 # $(BLD)/emacsclient.exe:      $(BLD)/emacsclient.$(O)
-# $(BLD)/test-distrib.exe:     $(BLD)/test-distrib.$(O)
 
 #
 # From ..\src\Makefile.in
@@ -202,6 +216,12 @@ lisp1= \
        $(lispsource)international/latin-5.el \
        $(lispsource)international/latin-8.el \
        $(lispsource)international/latin-9.el \
+       $(lispsource)fringe.elc \
+       $(lispsource)image.elc \
+       $(lispsource)international/fontset.elc \
+       $(lispsource)dnd.elc \
+       $(lispsource)mwheel.elc \
+       $(lispsource)tool-bar.elc \
        $(lispsource)case-table.elc
 
 lisp2 = \
@@ -256,6 +276,15 @@ lisp2 = \
        $(lispsource)window.elc \
        $(lispsource)version.el
 
+# 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.
+../src/$(BLD)/temacs.exe:
+       - mkdir "../src/$(OBJDIR)"
+       - mkdir "../src/$(BLD)"
+       @echo temacs > temacs.exe
+       $(CP) temacs.exe ../src/$(BLD)
+       - $(DEL) temacs.exe
 
 DOC          = DOC
 $(DOC):                $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
@@ -287,6 +316,9 @@ install:    $(INSTALL_FILES)
                $(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin
                $(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin
                $(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
 
@@ -309,7 +341,7 @@ cleanall:   clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:       ../nt/$(CONFIG_H)
-                       echo config.h has changed. Re-run configure.bat.
+                       echo $(CONFIG_H) has changed.  Re-run configure.bat.
                        exit -1
 
 getopt.h:              getopt_.h
@@ -442,7 +474,10 @@ $(BLD)/qsort.$(O) : \
        $(SRC)/qsort.c
 
 $(BLD)/sorted-doc.$(O) : \
-       $(SRC)/sorted-doc.c
+       $(SRC)/sorted-doc.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
 
 $(BLD)/tcp.$(O) : \
        $(SRC)/tcp.c
@@ -455,7 +490,3 @@ $(BLD)/timer.$(O) : \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/lib-src/../src/config.h
-
-$(BLD)/yow.$(O) : \
-       $(SRC)/yow.c \
-       $(EMACS_ROOT)/lib-src/../src/paths.h