Merged from miles@gnu.org--gnu-2005 (patch 116-117, 544-550)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-544
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-545
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-546
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-547
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-548
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-549
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-550
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-116
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-117
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-421

2 files changed, 11 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4cf0da4b644..76e56e77e16 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+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
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.  */