check errors from Sync(), score logging now done by log(),

[unix-history] / usr / src / games / sail / Makefile

diff --git a/usr/src/games/sail/Makefile b/usr/src/games/sail/Makefile
index a0b51b8..4b16340 100644 (file)
--- a/usr/src/games/sail/Makefile
+++ b/usr/src/games/sail/Makefile
@@ -1,53 +1,52 @@
 #
 # Sail - Wooden Ships And Iron Men
 #
 #
 # Sail - Wooden Ships And Iron Men
 #

-# Makefile     @(#)Makefile    1.9 83/05/20
+# Makefile     @(#)Makefile    2.5 84/02/14

 #
 #

-CC= cc
-CTAGS= ctags -w
-CFLAGS= -O
-DFILES= driver1.c driver2.c driver3.c grap.c
-DOBJS= driver1.o driver2.o driver3.o grap.o
-PFILES= version.c player1.c player2.c
-POBJS= version.o player1.o player2.o
-LFILES= sail.log.c
-LOBJS= sail.log.o
-COMMONFILES= assorted.c boarders.c game.c globals.c\
-       main.c parties.c screen.c machdep.c
-COMMONOBJS= assorted.o boarders.o game.o globals.o\
-       main.o parties.o screen.o machdep.o
-HDRS= externs.h player.h machdep.h
-OTHERFILES= Makefile sail.m
-CTAGFILES= ${DFILES} ${PFILES} ${LFILES} ${COMMONFILES}
-JUNKFILES= sail driver sail.log sail.doc junk arch tags
-PLIBS= -lcurses -ltermlib machdep.o -ljobs
+CC=    cc
+CTAGS= ctags -w
+CFLAGS=        -O
+
+DFILES=                driver1.c driver2.c driver3.c grap.c boarders.c
+DOBJS=         driver1.o driver2.o driver3.o grap.o boarders.o
+PFILES=                player1.c player2.c player3.c player4.c player5.c \
+               player6.c player7.c version.c
+POBJS=         player1.o player2.o player3.o player4.o player5.o \
+               player6.o player7.o version.o
+COMMONFILES=   assorted.c game.c globals.c misc.c parties.c sync.c
+COMMONOBJS=    assorted.o game.o globals.o misc.o parties.o sync.o
+LFILES=                sail.log.c
+LOBJS=         sail.log.o
+HDRS=          externs.h player.h driver.h machdep.h
+OTHERFILES=    Makefile sail.6
+CTAGFILES=     ${DFILES} ${PFILES} ${LFILES} ${COMMONFILES}
+JUNKFILES=     make.out
+PLIBS=         -lcurses -ltermlib

 DLIBS=
 LLIBS=
 DLIBS=
 LLIBS=

-SAILMASTER= daemon
-SAIL= sail
-DRIVER= lib/saildriver
-SAIL.LOG= sail.log
-SAIL.DOC= sail.doc
-SHIPSLOG= lib/saillog
-TARGET= /usr/games

 
 

-..c.o:; ${CC} ${CFLAGS} -c $<
+SAILMASTER=    daemon
+SAIL=          sail
+DRIVER=                lib/saildriver
+SAIL.LOG=      sail.log
+LOGFILE=       lib/saillog
+DESTDIR=
+TARGET=                $(DESTDIR)/usr/games

 
 

-all: sail driver sail.log sail.doc
+all: sail driver sail.log

 
 

-sail: ${COMMONOBJS} ${POBJS}
+sail: ${POBJS} ${COMMONOBJS}

        cc -O ${COMMONOBJS} ${POBJS} ${PLIBS} -o sail
 
        cc -O ${COMMONOBJS} ${POBJS} ${PLIBS} -o sail
 

-driver: ${COMMONOBJS} ${DOBJS}
+driver: ${DOBJS} ${COMMONOBJS}

        cc -O ${COMMONOBJS} ${DOBJS} ${DLIBS} -o driver
 
        cc -O ${COMMONOBJS} ${DOBJS} ${DLIBS} -o driver
 

-${DOBJS} ${POBJS} ${LOBJS} ${COMMONOBJS}: externs.h machdep.h
-

 sail.log: ${LOBJS} globals.o
        cc -O ${LOBJS} globals.o -o sail.log
 
 sail.log: ${LOBJS} globals.o
        cc -O ${LOBJS} globals.o -o sail.log
 

-sail.doc: sail.m
-#      nroff -man sail.m > sail.doc
+lint:
+       lint -z $(PFILES) $(COMMONFILES) -lcurses
+       lint -z $(DFILES) $(COMMONFILES)

 
 tags: ${CTAGFILES}
        ${CTAGS} ${CTAGFILES}
 
 tags: ${CTAGFILES}
        ${CTAGS} ${CTAGFILES}


@@ -55,27 +54,26 @@ tags: ${CTAGFILES}
 ${HDRS} ${CTAGFILES}:
        sccs get $@;
 
 ${HDRS} ${CTAGFILES}:
        sccs get $@;
 

-arch:  sail.ar
-       ar uv sail.ar ${PFILES} ${COMMONFILES} ${OTHERFILES} \
-       ${DFILES} ${LFILES} ${HDRS}
-
-driveprofile: ${COMMONOBJS} ${DOBJS}
-       cc -i -p ${COMMONOBJS} ${DOBJS} ${CFLAGS} ${DLIBS} -o DRIVE.pro
-
-profile: ${COMMONOBJS} ${POBJS} ${DOBJS}
-       cc -i -p ${COMMONOBJS} ${POBJS} ${CFLAGS} ${PLIBS} -o SAIL.pro
-       cc -i -p ${COMMONOBJS} ${DOBJS} ${CFLAGS} ${DLIBS} -o DRIVE.pro
-

 clean: 
        rm -f ${DOBJS} ${POBJS} ${LOBJS} ${COMMONOBJS} ${JUNKFILES}
 
 clean: 
        rm -f ${DOBJS} ${POBJS} ${LOBJS} ${COMMONOBJS} ${JUNKFILES}
 

-install: sail driver sail.log sail.doc ${TARGET}/${SHIPSLOG}
-       install -s -m 4711 -o ${SAILMASTER} sail ${TARGET}/${SAIL}
-       install -s -m 4711 -o ${SAILMASTER} driver ${TARGET}/${DRIVER}
-       install -s -m 711 sail.log ${TARGET}/${SAIL.LOG}
-#      cp sail.doc ${TARGET}/${SAIL.DOC}
+install: sail driver sail.log $(TARGET)/$(LOGFILE)
+       install -c -s -m 4755 -o ${SAILMASTER} sail ${TARGET}/${SAIL}
+       install -c -s -m 4755 -o ${SAILMASTER} driver ${TARGET}/${DRIVER}
+       install -c -s -m 755 sail.log ${TARGET}/${SAIL.LOG}
+       install -c sail.6 /usr/man/man6
+
+logfile $(TARGET)/$(LOGFILE):
+       cp /dev/null ${TARGET}/${LOGFILE}
+       chown ${SAILMASTER} ${TARGET}/${LOGFILE}
+       chmod 644 ${TARGET}/${LOGFILE}

 
 

-${TARGET}/${SHIPSLOG}:
-       cp /dev/null ${TARGET}/${SHIPSLOG}
-       chown ${SAILMASTER} ${TARGET}/${SHIPSLOG}
-       chmod 644 ${TARGET}/${SHIPSLOG}
+miro:
+       rdist -c '$(TARGET)/{$(SAIL),sail.log,$(DRIVER)}' \
+               /usr/man/man6/sail.6 miro
+cory:
+       rdist -c '$(TARGET)/{$(SAIL),sail.log,$(DRIVER)}' \
+               /usr/man/man6/sail.6 cory
+dali:
+       rdist -c '$(TARGET)/{$(SAIL),sail.log,$(DRIVER)}' \
+               /usr/man/man6/sail.6 dali