Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28256/tools
Modified Files:
Makefile.in metaget.c players.c
Log Message:
merge 2.11.1 from darcs
Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.in 12 May 2006 03:44:49 -0000 1.8
+++ Makefile.in 1 Jun 2006 03:17:26 -0000 1.9
@@ -32,13 +32,15 @@
${srcdir}/update.c ${srcdir}/convert.c \
${srcdir}/conq_vert.c $(RANDOMC) \
${srcdir}/sortdb.c \
- ${srcdir}/ntpasswd.c ${srcdir}/setplanet.c
+ ${srcdir}/ntpasswd.c \
+ ${srcdir}/setgame.c ${srcdir}/setplanet.c ${srcdir}/setteam.c
EXECS = blotpassword loadchecker mess message newscores planets players \
scores \
setgalaxy showgalaxy stat trimscores watchmes xtkill \
mergescores keyman updated fun conq_vert convert sortdb cambot \
- ntpasswd ltd_dump ltd_convert nuke trekon metaget setplanet
+ ntpasswd ltd_dump ltd_convert nuke trekon metaget \
+ setgame setplanet setteam
all: $(PMAKE) $(EXECS)
@@ -78,7 +80,9 @@
$(INSTALLPROG) $(INSTALLOPTS) updated $(DESTDIR)$(LIBDIR)/updated
$(INSTALLPROG) $(INSTALLOPTS) cambot $(DESTDIR)$(LIBDIR)/cambot
$(INSTALLPROG) $(INSTALLOPTS) metaget $(DESTDIR)$(LIBDIR)/tools/metaget
+ $(INSTALLPROG) $(INSTALLOPTS) setgame $(DESTDIR)$(LIBDIR)/tools/setgame
$(INSTALLPROG) $(INSTALLOPTS) setplanet $(DESTDIR)$(LIBDIR)/tools/setplanet
+ $(INSTALLPROG) $(INSTALLOPTS) setteam $(DESTDIR)$(LIBDIR)/tools/setteam
cambot: cambot.o $(OBJS)
$(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o $(OBJS) $(RSA_LIB)
@@ -161,9 +165,15 @@
metaget: metaget.o
$(CC) -o $@ $(CFLAGS) ${LDFLAGS} metaget.o $(EXTRALIBS)
+setgame: setgame.o $(OBJS)
+ $(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgame.o $(OBJS)
+
setplanet: setplanet.o $(OBJS)
$(CC) -o $@ $(CFLAGS) ${LDFLAGS} setplanet.o $(OBJS)
+setteam: setteam.o $(OBJS)
+ $(CC) -o $@ $(CFLAGS) ${LDFLAGS} setteam.o $(OBJS)
+
trekon: ${srcdir}/mktrekon ${srcdir}/trekon.bitmap ${srcdir}/trekoff.bitmap
${srcdir}/mktrekon $(LIBDIR)
chmod a+x trekon
Index: players.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/players.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- players.c 12 May 2006 03:44:50 -0000 1.7
+++ players.c 1 Jun 2006 03:17:26 -0000 1.8
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <errno.h>
#include <arpa/inet.h>
+#include <sys/socket.h>
#include "defs.h"
#include "struct.h"
#include "data.h"