Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 542-553)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 116-121)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

3 files changed, 20 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5767b49aaed..76e56e77e16 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-15  Richard M. Stallman  <rms@gnu.org>
+
+        * Makefile.in (update-game-score.o): New target.
+        Compile and link this progranm separately.
+        (update-game-score${EXEEXT}): Use GETOPTDEPTS.
+
+2005-09-11  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (../src/config.h): Don't overwrite. Print a
+        message instead.
+        (../src/paths.h): Removed.
+
 2005-07-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * .cvsignore: Don't ignore fns-* and fns.el, which are no longer
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 274bbabe29f..29fc2ec5374 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -460,10 +460,12 @@ emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
 hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
-update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/update-game-score.c \
+update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS)
+        $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score
+
+update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
+        $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
           -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
-          $(LOADLIBES) -o update-game-score
 
 /* These are NOT included in INSTALLABLES or UTILITIES.
    See ../src/Makefile.in.  */
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index bfda0f25d5f..a1a96098bd8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -300,9 +300,9 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:        ../nt/$(CONFIG_H)
-                        $(CP) $(ALL_DEPS) $@
-../src/paths.h:         ../nt/paths.h
-                        $(CP) $(ALL_DEPS) $@
+                        echo config.h has changed. Re-run configure.bat.
+                        exit -1
+
 getopt.h:               getopt_.h
                         $(CP) $(ALL_DEPS) $@