Update copyright notice.

[empserver] / Make.sysdefs

diff --git a/Make.sysdefs b/Make.sysdefs
index 37de56bb96aed7b4e4c90dbd7784a53e6c05a0e7..903f72d33e2f5961cd886af0847516b9f23746c7 100644 (file)
--- a/Make.sysdefs
+++ b/Make.sysdefs
@@ -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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 # 
 #   This program is free software; you can redistribute it and/or modify
@@ -31,13 +31,16 @@
 # the examples there on what to do.
 #
 
-OSXCFLAGS = -g -Wall -W -ansi -D_EMPTH_POSIX=1
+# Warning flags appropriate for gcc, unless system headers are severly broken
+GCCWARNFLAGS = -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wredundant-decls
+
+OSXCFLAGS = -g -fno-common -ansi -D_EMPTH_POSIX=1 $(GCCWARNFLAGS)
 # -O fails on Darwin 5.5, works on 6.6
 OSXLFLAGS = -flat_namespace -lcurses
 OSXMASTER = GLOBALCFLAGS="$(OSXCFLAGS)" GLOBALLFLAGS="$(OSXLFLAGS)"
 
 FREEBSDRANLIB = /usr/bin/ranlib
-FREEBSDCFLAGS = -DRel4 -DFBSD -ansi -pedantic #-Wall
+FREEBSDCFLAGS = -g -fno-common -DRel4 -DFBSD -ansi -pedantic $(GCCWARNFLAGS)
 FREEBSDLFLAGS = 
 FREEBSDMASTER = GLOBALCFLAGS="$(FREEBSDCFLAGS)" GLOBALLFLAGS="$(FREEBSDLFLAGS)" RANLIB="$(FREEBSDRANLIB)"
 
@@ -49,25 +52,29 @@ NTCFLAGS = /D_WIN32 /Od /G3 /Zp2 /nologo /MT
 NTLFLAGS =
 NTMASTER = CC=CL GLOBALCFLAGS="$(NTCFLAGS)" GLOBALLFLAGS="$(NTLFLAGS)"
 
+INTERIXCFLAGS = -g -fno-common -D_EMPTH_POSIX=1 -U_EMPTH_LWP -DLISTENMAXCONN=5 -DRel4 -D_ALL_SOURCE $(GCCWARNFLAGS)
+INTERIXLFLAGS = -lpthread
+INTERIXMASTER = GLOBALCFLAGS="$(INTERIXCFLAGS)" GLOBALLFLAGS="$(INTERIXLFLAGS)" CLIENTLIBS=-lncurses
+
 NEXTCFLAGS = -bsd -fwritable-strings -traditional -Dconst="" -Dinline=""
 NEXTLFLAGS = -lsys_s
 NEXTMASTER = GLOBALCFLAGS="$(NEXTCFLAGS)" GLOBALLFLAGS="$(NEXTLFLAGS)"
 
-LINUXCFLAGS = -g -Wall -W -Wno-unused -Dlint -D__USE_BSD -D__USE_BSD_SIGNAL -DLISTENMAXCONN=5 -DRel4
+LINUXCFLAGS = -g -fno-common -D__USE_BSD -DLISTENMAXCONN=5 -DRel4 $(GCCWARNFLAGS) 
 LINUXLFLAGS = 
 LINUXMASTER = GLOBALCFLAGS="$(LINUXCFLAGS)" GLOBALLFLAGS="$(LINUXLFLAGS)" CLIENTLIBS=-lncurses
 
-LINUXPTHCFLAGS = -g -Wall -W -Wno-unused -Dlint -D_EMPTH_POSIX=1 -U_EMPTH_LWP -D__USE_BSD -D__USE_BSD_SIGNAL -DLISTENMAXCONN=5 -DRel4
+LINUXPTHCFLAGS = -g -fno-common -D_EMPTH_POSIX=1 -U_EMPTH_LWP -DLISTENMAXCONN=5 -DRel4 $(GCCWARNFLAGS)
 LINUXPTHLFLAGS = -lpthread
 LINUXPTHMASTER = GLOBALCFLAGS="$(LINUXPTHCFLAGS)" GLOBALLFLAGS="$(LINUXPTHLFLAGS)" CLIENTLIBS=-lncurses
 
 HPRANLIB = true
-HPCFLAGS = -Aa -Dsys5 -DNOFLOCK -Dhpc -D_HPUX_SOURCE -Dhpux
+HPCFLAGS = -Aa -Dsys5 -Dhpc -D_HPUX_SOURCE -Dhpux
 HPLFLAGS = 
 HPMASTER = GLOBALCFLAGS="$(HPCFLAGS)" GLOBALLFLAGS="$(HPLFLAGS)" RANLIB="$(HPRANLIB)" CLIENTLIBS=-ltermcap
 
 HPUXRANLIB = true
-HPUXCFLAGS = -Dsys5 -DNOFLOCK
+HPUXCFLAGS = -Dsys5
 HPUXLFLAGS = 
 HPUXMASTER = GLOBALCFLAGS="$(HPUXCFLAGS)" GLOBALLFLAGS="$(HPUXLFLAGS)" RANLIB="$(HPUXRANLIB)" CLIENTLIBS=-ltermcap
 
@@ -85,11 +92,11 @@ ISICFLAGS =
 ISILFLAGS = 
 ISIMASTER = GLOBALCFLAGS="$(ISICFLAGS)" GLOBALLFLAGS="$(ISILFLAGS)"
 
-RTPCCFLAGS = -DBSD_INCLUDES -Daix -Dsys5 $(LOCALCFLAGS) -DNOFLOCK -a
+RTPCCFLAGS = -DBSD_INCLUDES -Daix -Dsys5 $(LOCALCFLAGS) -a
 RTPCLFLAGS = 
 RTPCMASTER = GLOBALCFLAGS="$(RTPCCFLAGS)" GLOBALLFLAGS="$(RTPCLFLAGS)"
 
-SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -DPOSIXSIGNALS -DNOFLOCK -Dsolaris
+SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -DPOSIXSIGNALS -Dsolaris
 SOLLFLAGS = -lnsl -lsocket -lthread
 SOLMASTER = GLOBALCFLAGS="$(SOLCFLAGS)" GLOBALLFLAGS="$(SOLLFLAGS)"
 
@@ -119,7 +126,7 @@ SUN4OPTCFLAGS = -O -DSUN4
 SUN4OPTLFLAGS = 
 SUN4OPTMASTER = GLOBALCFLAGS="$(SUN4OPTCFLAGS)" GLOBALLFLAGS="$(SUN4OPTLFLAGS)"
 
-AIXCFLAGS = -Daix -Dsys5 $(LOCALCFLAGS) -DNOFLOCK -D_BSD_INCLUDES -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -U__STR__ -DAIX32
+AIXCFLAGS = -Daix -Dsys5 $(LOCALCFLAGS) -D_BSD_INCLUDES -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -U__STR__ -DAIX32
 AIXLFLAGS = -lbsd
 AIXMASTER = GLOBALCFLAGS="$(AIXCFLAGS)" GLOBALLFLAGS="$(AIXLFLAGS)" CLIENTLIBS="-lcurses"