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

[empserver] / Makefile

diff --git a/Makefile b/Makefile
index 49f44e37541fca55138dec7a1a4c1c1c5babedd7..1c464349b2cb198aa9d6d9fa683f94d18c74bb59 100644 (file)
--- a/Makefile
+++ b/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
@@ -53,15 +53,13 @@ all:
        @echo '   freebsd'
        @echo '   hp'
        @echo '   hpux'
+       @echo '   interix'
        @echo '   irix'
        @echo '   irix5'
        @echo '   isi'
        @echo '   linux'
        @echo '   linux-pthreads'
        @echo '   mach2.5'
-       @echo '   mipsbsd'
-       @echo '   mipsultrix'
-       @echo '   mipsultrix.gcc'
        @echo '   next'
        @echo '   nt'
        @echo '   osx'
@@ -73,7 +71,6 @@ all:
        @echo '   sun4'
        @echo '   sun4.debug'
        @echo '   sun4.opt'
-       @echo '   vaxultrix'
 
 alpha:
        @echo 'building a $(WORLDX) by $(WORLDY) server...'
@@ -180,14 +177,6 @@ linux-pthreads:
        ($(MAKE) binaries $(LINUXPTHMASTER))
        ($(MAKE) install)
 
-mipsbsd:
-       @echo 'building a $(WORLDX) by $(WORLDY) server...'
-       (cd src/doconfig; $(MAKE) $(MIPSBSDMASTER))
-       ($(MAKE) genlibs $(MIPSBSDMASTER))
-       (cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSBSDMASTER))
-       ($(MAKE) binaries $(MIPSBSDMASTER))
-       ($(MAKE) install)
-
 mach2.5:
        @echo 'building a $(WORLDX) by $(WORLDY) server...'
        (cd src/doconfig; $(MAKE) $(MACH25MASTER))
@@ -196,22 +185,6 @@ mach2.5:
        ($(MAKE) binaries $(MACH25MASTER))
        ($(MAKE) install)
 
-mipsultrix:
-       @echo 'building a $(WORLDX) by $(WORLDY) server...'
-       (cd src/doconfig; $(MAKE) $(MIPSULTMASTER))
-       ($(MAKE) genlibs $(MIPSULTMASTER))
-       (cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSULTMASTER))
-       ($(MAKE) binaries $(MIPSULTMASTER))
-       ($(MAKE) install)
-
-mipsultrix.gcc:
-       @echo 'building a $(WORLDX) by $(WORLDY) server...'
-       (cd src/doconfig; $(MAKE) $(MIPSULTGMASTER))
-       ($(MAKE) genlibs $(MIPSULTGMASTER))
-       (cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSULTGMASTER))
-       ($(MAKE) binaries $(MIPSULTGMASTER))
-       ($(MAKE) install)
-
 nt:
        @echo 'building a $(WORLDX) by $(WORLDY) server...'
        cd src/doconfig
@@ -224,12 +197,12 @@ nt:
        $(MAKE) ntbinaries TOBUILD=nt $(NTMASTER)
        $(MAKE) ntinstall
 
-vaxultrix:
+interix:
        @echo 'building a $(WORLDX) by $(WORLDY) server...'
-       (cd src/doconfig; $(MAKE) $(VAXULTMASTER))
-       ($(MAKE) genlibs $(VAXULTMASTER))
-       (cd src/lib/lwp; $(MAKE) $(VAXULTMASTER))
-       ($(MAKE) binaries $(VAXULTMASTER))
+       (cd src/doconfig; $(MAKE) $(INTERIXMASTER))
+       ($(MAKE) genlibs $(INTERIXMASTER))
+       (cd src/lib/lwp; $(MAKE) $(INTERIXMASTER))
+       ($(MAKE) binaries $(INTERIXMASTER))
        ($(MAKE) install)
 
 aix:
@@ -328,6 +301,7 @@ ntbinaries:
 
 genlibs:
        @echo 'building generic libraries'
+       -mkdir lib
        (cd src/lib/as; $(MAKE)  $(GENMASTER))
        (cd src/lib/commands; $(MAKE)  $(GENMASTER))
        (cd src/lib/common; $(MAKE)  $(GENMASTER))
@@ -440,20 +414,8 @@ realclean:
        (rm -rf data/*)
        -(rm -rf $(EMPDIR)/data/*)
        -(rm -rf $(EMPDIR)/bin/*)
-       (cd src/lib/as ; echo "# Empty" > Makedepend)
-       (cd src/lib/commands ; echo "# Empty" > Makedepend)
-       (cd src/lib/common ; echo "# Empty" > Makedepend)
-       (cd src/lib/gen ; echo "# Empty" > Makedepend)
-       (cd src/lib/global ; echo "# Empty" > Makedepend)
-       (cd src/lib/player ; echo "# Empty" > Makedepend)
-       (cd src/lib/subs ; echo "# Empty" > Makedepend)
-       (cd src/lib/update ; echo "# Empty" > Makedepend)
-       (cd src/lib/lwp ; echo "# Empty" > Makedepend)
-       (cd src/lib/empthread ; echo "# Empty" > Makedepend)
-       (cd src/client ; echo "# Empty" > Makedepend)
-       (cd src/server ; echo "# Empty" > Makedepend)
-       (cd src/util ; echo "# Empty" > Makedepend)
-       (cd src/doconfig ; echo "# Empty" > Makedepend)
+       rm -rf lib info.nr info.html
+       rm -f include/gamesdef.h src/client/ipglob.c src/make.src
 
 ntrealclean:
        $(MAKE) ntclean
@@ -463,48 +425,6 @@ ntrealclean:
        cd data
        -(del /Q *.*)
        cd ..
-       cd src/lib/as
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/commands
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/common
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/gen
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/global
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/player
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/subs
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/update
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/lwp
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/lib/empthread
-       echo # Empty > Makedepend
-       cd ../../../
-       cd src/client
-       echo # Empty > Makedepend
-       cd ../../
-       cd src/server
-       echo # Empty > Makedepend
-       cd ../../
-       cd src/util
-       echo # Empty > Makedepend
-       cd ../../
-       cd src/doconfig
-       echo # Empty > Makedepend
-       cd ../../
        cd $(EMPDIR)\data
        -(del /Q *.*)
        -(rmdir tel)
@@ -539,12 +459,12 @@ install:
        (cd src/client; $(MAKE) install)
        (cd src/server; $(MAKE) install)
        (cd src/util; $(MAKE) install)
+       -mkdir $(EMPDIR)/data
        -(mv $(EMPDIR)/data/econfig $(EMPDIR)/data/econfig.bak)
        ($(EMPDIR)/bin/pconfig > $(EMPDIR)/data/econfig)
        -(mv $(EMPDIR)/data/econfig.bak $(EMPDIR)/data/econfig)
 
 ntinstall:
-       -(mkdir bin)
        cd src\client
        $(MAKE) ntinstall
        cd ..\..
@@ -554,8 +474,11 @@ ntinstall:
        cd src\util
        $(MAKE) ntinstall
        cd ..\..
-       cd data
+       -mkdir $(NTINSTDIR)\data
+       cd $(NTINSTDIR)\data
        ($(NTINSTDIR)\bin\pconfig.exe > $(NTINSTDIR)\data\econfig.new)
        -(move econfig.new econfig)
        cd ..
 
+dist:
+       src/scripts/mkdist