(nati, player_coms): Add ability for deities to request a nation report for any country.

[empserver] / src / util / Makefile

diff --git a/src/util/Makefile b/src/util/Makefile
index e1ecccb95c658385afbb83de1878ad4bdc79c223..cedcdbbeaba70c410f310dab6bb5c63fd5688694 100644 (file)
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -1,6 +1,6 @@
 # 
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 # 
 #   This program is free software; you can redistribute it and/or modify
@@ -34,19 +34,17 @@ include ../make.defs
 
 LIBDIR = $(SRCDIR)/lib
 
-LIBS = $(LIBDIR)/libsubs.a \
-       $(LIBDIR)/libcommon.a \
+LIBS = $(LIBDIR)/libcommon.a \
        $(LIBDIR)/libgen.a \
        $(LIBDIR)/libglobal.a
 
-NTLIBS = $(LIBDIR)\libsubs.lib \
-       $(LIBDIR)\libcommon.lib \
+NTLIBS = $(LIBDIR)\libcommon.lib \
        $(LIBDIR)\libgen.lib \
        $(LIBDIR)\libglobal.lib
 
-OBJS = fairland.o files.o land.o ore.o pconfig.o perfect.o
+OBJS = fairland.o files.o pconfig.o
 
-NTOBJS = fairland.obj files.obj land.obj ore.obj pconfig.obj perfect.obj
+NTOBJS = fairland.obj files.obj pconfig.obj
 
 nt: ntfairland ntfiles ntpconfig
 
@@ -54,8 +52,6 @@ all: fairland files pconfig
 
 osx: fairland files pconfig
 
-# all: $(OBJS) fairland files land ore pconfig perfect
-
 ntfiles: files.obj
        link /OUT:files.exe \
         /NOD /DEBUG:full /DEBUGTYPE:cv /MACHINE:IX86 /NOLOGO \
@@ -68,12 +64,6 @@ ntfiles: files.obj
 files: files.o
        $(CC) -o files $(IFLAGS) $(CFLAGS) files.o $(LIBS) $(LFLAGS) -lc
 
-land: land.o
-       $(CC) -o land $(IFLAGS) $(CFLAGS) land.o $(LIBS) $(LFLAGS) -lc
-
-ore: ore.o
-       $(CC) -o ore $(IFLAGS) $(CFLAGS) ore.o $(LIBS) $(LFLAGS) -lc
-
 fairland: fairland.o
        $(CC) -o fairland $(IFLAGS) $(CFLAGS) fairland.o $(LIBS) $(LFLAGS) -lc
 
@@ -86,13 +76,10 @@ ntfairland: fairland.obj
         libcmt.lib \
         oldnames.lib
 
-perfect: perfect.o
-       $(CC) -o perfect $(IFLAGS) $(CFLAGS) perfect.o $(LIBS) $(LFLAGS) -lc
-
 pconfig: pconfig.o
        $(CC) -o pconfig $(IFLAGS) $(CFLAGS) pconfig.o $(LIBS) $(LFLAGS) -lc
 
-ntpconfig: pconfig.o
+ntpconfig: pconfig.obj
        link /OUT:pconfig.exe \
         /NOD /DEBUG:full /DEBUGTYPE:cv /MACHINE:IX86 /NOLOGO \
         pconfig.obj $(NTLIBS) \
@@ -102,25 +89,19 @@ ntpconfig: pconfig.o
         oldnames.lib
 
 clean:
-       -(rm -f files land ore fairland perfect pconfig $(OBJS))
+       -(rm -f files fairland pconfig $(OBJS))
        -(del /q *.exe *.pdb *.ilk $(NTOBJS))
 
 install:
        -(mkdir $(EMPDIR)/bin)
        -(cp files $(EMPDIR)/bin)
-#      -(cp land $(EMPDIR)/bin)
-#      -(cp ore $(EMPDIR)/bin)
        -(cp fairland $(EMPDIR)/bin)
-#      -(cp perfect $(EMPDIR)/bin)
        -(cp pconfig $(EMPDIR)/bin)
 
 ntinstall:
        -(mkdir $(NTINSTDIR)\bin)
        -(copy files.exe $(NTINSTDIR)\bin)
-#      -(copy land.exe $(NTINSTDIR)\bin)
-#      -(copy ore.exe $(NTINSTDIR)\bin)
        -(copy fairland.exe $(NTINSTDIR)\bin)
-#      -(copy perfect.exe $(NTINSTDIR)\bin)
        -(copy pconfig.exe $(NTINSTDIR)\bin)
 
 include ../make.rules