Merged from emacs--devo--0

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

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index d5e8e05d8107b22b180de97afef30378b56c18ff..345593cb126f0749acabb3e7b1636e51f5d9f9aa 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 Free Software Foundation, Inc.
+#                2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -24,11 +24,13 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
+VERSION                = 23.0.51
+
 LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
                  -I../src
 
-LIBS         = $(BASE_LIBS) $(ADVAPI32)
+LIBS           = $(BASE_LIBS) $(ADVAPI32)
 
 $(BLD)/make-docfile.exe:       $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
@@ -43,18 +45,18 @@ $(BLD)/digest-doc.exe:      $(BLD)/digest-doc.$(O)
 $(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
-etags:         $(BLD) $(BLD)/etags.exe
-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 $(BLD)/emacsclientw.exe
-
-test-distrib:  $(BLD) $(BLD)/test-distrib.exe
+make-docfile:  stamp_BLD $(BLD)/make-docfile.exe
+ctags:         stamp_BLD $(BLD)/ctags.exe
+etags:         stamp_BLD $(BLD)/etags.exe
+ebrowse:        stamp_BLD $(BLD)/ebrowse.exe
+hexl:          stamp_BLD $(BLD)/hexl.exe
+movemail:      stamp_BLD $(BLD)/movemail.exe
+fakemail:      stamp_BLD $(BLD)/fakemail.exe
+sorted-doc:    stamp_BLD $(BLD)/sorted-doc.exe
+digest-doc:    stamp_BLD $(BLD)/digest-doc.exe
+emacsclient:   stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
+
+test-distrib:  stamp_BLD $(BLD)/test-distrib.exe
        "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
 
 GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O)
@@ -68,21 +70,27 @@ $(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 = -DHAVE_GETCWD -DHAVE_STRERROR
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\""
 ECLIENTOBJS =  $(BLD)/emacsclient.$(O) \
                $(BLD)/getopt.$(O) \
                $(BLD)/getopt1.$(O) \
                $(BLD)/ntlib.$(O)
+TRES =         ../nt/$(BLD)/emacs.res
+
+$(TRES):       ../nt/emacs.rc
+               $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
 
 $(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)
+               $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
 
-$(BLD)/emacsclientw.exe:       $(ECLIENTOBJS)
+$(BLD)/emacsclientw.exe:       $(ECLIENTOBJS) $(TRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-               $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+               $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
 
-$(BLD)/emacsclient.$(O):       emacsclient.c
+# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
+# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
+$(BLD)/emacsclient.$(O):       emacsclient.c makefile.w32-in
                $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
 
 ETAGSOBJ      = $(BLD)/etags.$(O) \
@@ -277,7 +285,7 @@ lisp2 = \
        - $(DEL) temacs.exe
 
 DOC          = DOC
-$(DOC):                $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
+$(DOC):                stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
                - $(DEL) $(DOC)
                "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj)
                "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
@@ -293,7 +301,7 @@ $(DOC):             $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp
 #
 # Build the executables
 #
-all:           $(BLD) $(ALL) $(DOC)
+all:           stamp_BLD $(ALL) $(DOC)
 
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.
@@ -321,6 +329,7 @@ clean:
                - $(DEL) ctags.c
                - $(DEL) getopt.h
                - $(DEL_TREE) $(OBJDIR)
+               - $(DEL) stamp_BLD
 
 cleanall:      clean
                - $(DEL_TREE) obj
@@ -474,3 +483,16 @@ $(BLD)/timer.$(O) : \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/lib-src/../src/config.h
+
+# The following dependencies are for supporting parallel builds, where
+# we must make sure $(BLD) exists before any compilation starts.
+#
+$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD
+
+$(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O): stamp_BLD
+
+$(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS): stamp_BLD
+
+$(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD
+
+$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD