[Vanilla Devel] CVS update: Vanilla/tools

Tue May 1 21:00:20 CDT 2001

Date:	Tuesday May 1, 2001 @ 21:00
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/tools
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv1006/tools

Modified Files:
	Makefile.in fun.c ltd_convert.c ltd_dump.c setgalaxy.c 
	update.c 
Log Message:
Wed May  2 12:34:59 2001  James Cameron  <quozl at us.netrek.org>

	* all: move include files to own directory.  Changes were
	contributed by Benjamin `Quisar' Lerman <quisar at quisar.ambre.net>
	and verified by me.


****************************************

Index: Vanilla/tools/Makefile.in
diff -u Vanilla/tools/Makefile.in:1.3 Vanilla/tools/Makefile.in:1.4

--- Vanilla/tools/Makefile.in:1.3	Mon Apr 30 04:34:36 2001
+++ Vanilla/tools/Makefile.in	Tue May  1 21:00:20 2001
@@ -14,7 +14,7 @@
 
 # this is for revised ntserv/struct.h
 
-CFLAGS = $(EXTRAINCS) $(DIRS) $(FLAGS) -I. -I${srcdir}
+CFLAGS = $(EXTRAINCS) $(FLAGS) -I. -I${srcdir} -I../include -I${srcdir}/../include
 
 #LIBCURSES = -lcurses
 LIBS = $(EXTRALIBS)
@@ -22,8 +22,6 @@
 TOOLDIR= $(LIBDIR)/tools
 
 GETPATH = ../ntserv/getpath.o ../ntserv/data.o
-STRUCTS = ${srcdir}/../ntserv/struct.h ../ntserv/defs.h \
-	${srcdir}/../ntserv/data.h
 
 LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS)
 
@@ -48,7 +46,7 @@
 EXECS =	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
+        ntpasswd ltd_dump ltd_convert nuke trekon
 
 all: $(PMAKE) $(EXECS)
 
@@ -93,69 +91,69 @@
 cambot: cambot.o $(M_OBJS) $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o ../ntserv/genspkt.o ../ntserv/sysdefaults.o ../ntserv/getship.o ../ntserv/warning.o ../ntserv/smessage.o ../ntserv/distress.o ../ntserv/util.o $(M_OBJS) ../ntserv/getpath.o  $(RSA_LIB)
 
-sortdb: ${srcdir}/sortdb.c ${srcdir}/../ntserv/struct.h ../ntserv/defs.h
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} ${srcdir}/sortdb.c
+sortdb: sortdb.o
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} sortdb.o
 
-ntpasswd: ntpasswd.o $(STRUCTS) $(GETPATH) ${srcdir}/../ntserv/salt.h ../ntserv/salt.o
+ntpasswd: ntpasswd.o $(GETPATH) ../ntserv/salt.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} ntpasswd.o $(GETPATH) ../ntserv/salt.o $(LIBCRYPT)
 
-loadchecker: loadchecker.o $(STRUCTS) $(M_OBJS)
+loadchecker: loadchecker.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} loadchecker.o $(M_OBJS) $(LIBS)
 
-mess: mess.o $(STRUCTS) $(M_OBJS)
+mess: mess.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mess.o $(M_OBJS) $(LIBS)
 
-message: message.o $(STRUCTS) $(M_OBJS)
+message: message.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} message.o $(M_OBJS) $(LIBS)
 
-mergescores: mergescores.o $(GETPATH) $(STRUCTS)
+mergescores: mergescores.o $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mergescores.o $(GETPATH) $(LIBS)
 
-newscores: newscores.o $(GETPATH) $(STRUCTS)
+newscores: newscores.o $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} newscores.o $(GETPATH) $(LIBS)
 
-planets: planets.o $(STRUCTS) $(M_OBJS)
+planets: planets.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} planets.o $(M_OBJS) $(LIBS)
 
-players: players.o $(STRUCTS) $(M_OBJS) $(RANDOMO)
+players: players.o $(M_OBJS) $(RANDOMO)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} players.o $(M_OBJS) $(RANDOMO) $(LIBS)
 
-nuke: nuke.o $(STRUCTS) $(M_OBJS) $(RANDOMO)
+nuke: nuke.o $(M_OBJS) $(RANDOMO)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} nuke.o $(M_OBJS) $(RANDOMO) $(LIBS)
 
 # some weird problem with the MIPS RISC compiler for DECstations...
 # gcc seems to compile working executables (TC)
 #
-scores: scores.o $(GETPATH) $(STRUCTS)
+scores: scores.o $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} scores.o $(GETPATH) $(LIBS) ../ntserv/ltd_stats.o
 #	gcc -o $@ $(CFLAGS) -g scores.o -L/usr/users/terence/lib
 #	cp scores /usr/users/terence/bin/trekscores
 
-setgalaxy: setgalaxy.o $(RANDOMO) $(STRUCTS) $(M_OBJS)
+setgalaxy: setgalaxy.o $(RANDOMO) $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgalaxy.o $(RANDOMO) $(M_OBJS) $(LIBS)
 
-showgalaxy: showgalaxy.o ../ntserv/distress.o $(STRUCTS) $(M_OBJS)
+showgalaxy: showgalaxy.o ../ntserv/distress.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} showgalaxy.o ../ntserv/distress.o $(M_OBJS) $(LIBS) $(LIBCURSES) $(LIBTERMCAP)
 
-stat: stat.o $(STRUCTS) $(M_OBJS)
+stat: stat.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} stat.o $(M_OBJS) $(LIBS)
 
-trimscores: trimscores.o $(GETPATH) $(STRUCTS)
+trimscores: trimscores.o $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} trimscores.o $(GETPATH) $(LIBS)
 
-watchmes: watchmes.o ../ntserv/distress.o $(STRUCTS) $(M_OBJS)
+watchmes: watchmes.o ../ntserv/distress.o $(M_OBJS)
 	$(CC) $(CFLAGS) ${LDFLAGS} watchmes.o ../ntserv/distress.o $(M_OBJS) $(LIBS) -o $@
 
-xtkill: xtkill.o $(GETPATH) $(STRUCTS) ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o
+xtkill: xtkill.o $(GETPATH) ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} xtkill.o ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o $(GETPATH) $(LIBS)
 
-keyman: keyman.o $(GETPATH) $(STRUCTS)
+keyman: keyman.o $(GETPATH)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} keyman.o $(GETPATH) $(LIBS)
 
-fun: $(RANDOMO) fun.o $(STRUCTS) $(M_OBJS)
+fun: $(RANDOMO) fun.o $(M_OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} fun.o $(RANDOMO) $(M_OBJS) $(LIBS)
 
-convert: $(GETPATH) convert.o $(STRUCTS)
+convert: $(GETPATH) convert.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} convert.o $(GETPATH) $(LIBS)
 
 updated: update.o $(GETPATH)
@@ -167,7 +165,7 @@
 ltd_convert: ltd_convert.o
 	$(CC) $(CFLAGS) ${LDFLAGS} -o ltd_convert ltd_convert.o ../ntserv/ltd_stats.o $(GETPATH)
 
-conq_vert: conq_vert.o $(STRUCTS)
+conq_vert: conq_vert.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} conq_vert.o
 
 trekon: ${srcdir}/mktrekon ${srcdir}/trekon.bitmap ${srcdir}/trekoff.bitmap
Index: Vanilla/tools/fun.c
diff -u Vanilla/tools/fun.c:1.3 Vanilla/tools/fun.c:1.4
--- Vanilla/tools/fun.c:1.3	Sun Jul 11 22:33:04 1999
+++ Vanilla/tools/fun.c	Tue May  1 21:00:20 2001
@@ -19,7 +19,7 @@
 #include <ctype.h>
 #include "defs.h"
 #include INC_STRINGS
-#include "../ntserv/data.h"
+#include "data.h"
 #include "struct.h"
 
 extern int openmem(int);
Index: Vanilla/tools/ltd_convert.c
diff -u Vanilla/tools/ltd_convert.c:1.4 Vanilla/tools/ltd_convert.c:1.5
--- Vanilla/tools/ltd_convert.c:1.4	Fri Apr 27 21:42:34 2001
+++ Vanilla/tools/ltd_convert.c	Tue May  1 21:00:20 2001
@@ -1,5 +1,5 @@
 /*
- * $Id: ltd_convert.c,v 1.4 2001/04/28 02:42:34 cameron Exp $
+ * $Id: ltd_convert.c,v 1.5 2001/05/02 02:00:20 cameron Exp $
  *
  * ahn at users.sourceforge.net
  *
@@ -7,7 +7,7 @@
  * USE WITH CAUTION!
  */
 
-#include "../config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,7 +39,7 @@
 
 #else
 
-const char rcsid[] = "$Id: ltd_convert.c,v 1.4 2001/04/28 02:42:34 cameron Exp $";
+const char rcsid[] = "$Id: ltd_convert.c,v 1.5 2001/05/02 02:00:20 cameron Exp $";
 
 void error(const char *fmt, ...) {
 
Index: Vanilla/tools/ltd_dump.c
diff -u Vanilla/tools/ltd_dump.c:1.8 Vanilla/tools/ltd_dump.c:1.9
--- Vanilla/tools/ltd_dump.c:1.8	Mon Apr 30 04:13:03 2001
+++ Vanilla/tools/ltd_dump.c	Tue May  1 21:00:20 2001
@@ -1,4 +1,4 @@
-/* $Id: ltd_dump.c,v 1.8 2001/04/30 09:13:03 cameron Exp $
+/* $Id: ltd_dump.c,v 1.9 2001/05/02 02:00:20 cameron Exp $
  *
  * Dave Ahn
  *
@@ -6,7 +6,7 @@
  *
  * */
 
-#include "../config.h"
+#include "config.h"
 
 #include <stdio.h>
 
@@ -28,7 +28,7 @@
 #define LEN_ABBR	4
 #define LEN_NAME	30
 
-static const char rcsid [] = "$Id: ltd_dump.c,v 1.8 2001/04/30 09:13:03 cameron Exp $";
+static const char rcsid [] = "$Id: ltd_dump.c,v 1.9 2001/05/02 02:00:20 cameron Exp $";
 
 static FILE *fp;
 
Index: Vanilla/tools/setgalaxy.c
diff -u Vanilla/tools/setgalaxy.c:1.2 Vanilla/tools/setgalaxy.c:1.3
--- Vanilla/tools/setgalaxy.c:1.2	Fri Apr 30 15:19:13 1999
+++ Vanilla/tools/setgalaxy.c	Tue May  1 21:00:20 2001
@@ -27,8 +27,8 @@
 #include "defs.h"
 #include INC_STRINGS
 #include "struct.h"
-#include "../ntserv/planets.h"
-#include "../ntserv/data.h"
+#include "planets.h"
+#include "data.h"
 
 extern int openmem(int);
 
Index: Vanilla/tools/update.c
diff -u Vanilla/tools/update.c:1.9 Vanilla/tools/update.c:1.10
--- Vanilla/tools/update.c:1.9	Fri Jun 23 04:12:59 2000
+++ Vanilla/tools/update.c	Tue May  1 21:00:20 2001
@@ -30,9 +30,9 @@
 #include INC_SYS_PTYIO
 #include "struct.h"
 #include "data.h"
-#include "../patchlevel.h"
+#include "patchlevel.h"
 #define SVERS
-#include "../version.h"
+#include "version.h"
 
 /* DEFINABLES. Set these to your enviroment */
 

