Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com and 2011-02-09T17:04:43Z!schwab@linux-m68k.org.

 src/makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
 macros.
 (globals.h, gl-stamp): New targets.
 (clean): Clean gl-stamp and globals.h.
 nt/makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
 "make-docfile" target in lib-src, before bootstrapping the src
 directory.  Needed since building in src needs to run make-docfile
 to produce globals.h.

4 files changed, 49 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e7f005cce61..41273114429 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
+        "make-docfile" target in lib-src, before bootstrapping the src
+        directory.  Needed since building in src needs to run make-docfile
+        to produce globals.h.
+
 2011-02-04  Eli Zaretskii  <eliz@gnu.org>
 
         * config.nt (inline) [__GNUC__]: Define (for gnulib).
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 28ee8b6e09c..31ca3143fb8 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -160,7 +160,7 @@ bootstrap-nmake: addsection cmdproxy
         cd ..\src

         $(MAKE) $(MFLAGS) clean

         cd ..\lib-src

-        $(MAKE) $(MFLAGS) clean

+        $(MAKE) $(MFLAGS) clean make-docfile

         cd ..\lib

         $(MAKE) $(MFLAGS) clean all

         cd ..\src

@@ -177,7 +177,7 @@ bootstrap-nmake: addsection cmdproxy
 bootstrap-gmake: addsection cmdproxy

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

+        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

diff --git a/src/ChangeLog b/src/ChangeLog
index 270edc59926..5cbcd35b5c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
+        macros.
+        (globals.h, gl-stamp): New targets.
+        (clean): Clean gl-stamp and globals.h.
+
 2011-02-09  Andreas Schwab  <schwab@linux-m68k.org>
 
         * Makefile.in (gl-stamp): Create globals.h here.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 54a30f28ff2..ce4b9f35de8 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -203,6 +203,38 @@ make-buildobj-SH:
         echo $(OBJ2)                   '\' >> buildobj.h
         echo '$(DQUOTE)'                   >> buildobj.h
 
+GLOBAL_SOURCES =   dosfns.c msdos.c \
+        xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
+        fontset.c menu.c dbusbind.c \
+        w32.c w32console.c w32fns.c w32heap.c w32inevt.c \
+        w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
+        font.c w32font.c w32uniscribe.c \
+        dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
+        charset.c coding.c category.c ccl.c character.c chartab.c \
+        cm.c term.c terminal.c xfaces.c \
+        emacs.c keyboard.c macros.c keymap.c sysdep.c \
+        buffer.c filelock.c insdel.c marker.c \
+        minibuf.c fileio.c dired.c filemode.c \
+        cmds.c casetab.c casefiddle.c indent.c search.c regex.c undo.c \
+        alloc.c data.c doc.c editfns.c callint.c \
+        eval.c floatfns.c fns.c print.c lread.c \
+        syntax.c bytecode.c \
+        process.c callproc.c unexw32.c \
+        region-cache.c sound.c atimer.c \
+        doprnt.c intervals.c textprop.c composite.c md5.c
+SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
+  xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
+obj = $(GLOBAL_SOURCES:.c=.o)
+
+globals.h: gl-stamp
+
+gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
+        - $(DEL) gl-tmp
+        "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
+        cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
+        - $(DEL) gl-tmp
+        echo timestamp > $@
+
 bootstrap: bootstrap-emacs
 
 #
@@ -279,7 +311,7 @@ clean:
         - $(DEL) "s/*.h~" "m/*.h~"
         - $(DEL) $(COMPILER_TEMP_FILES)
         - $(DEL_TREE) $(OBJDIR)
-        - $(DEL) stamp_BLD
+        - $(DEL) stamp_BLD gl-stamp globals.h
         - $(DEL) buildobj.h
 
 distclean:      cleanall