Updates for the build machinery.

[super-star-trek.git] / makefile

diff --git a/makefile b/makefile
index b2ae6162c271ed1b87c4308844a527bc80e01ee1..5865d6b1fac203e72426f9497e229079359126f6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,13 +1,13 @@
 #      Makefile for the Super Star Trek game
 
-VERS=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
+VERSION=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
 
-CFLAGS=     -O -g -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
+CFLAGS= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
 
 .c.o:
        $(CC) $(CFLAGS) -c $<
 
-CFILES= sst.c finish.c reports.c setup.c moving.c battle.c events.c ai.c planets.c io.c
+CFILES= sst.c finish.c reports.c setup.c moving.c battle.c events.c ai.c planets.c io.c sstlinux.c
 OFILES= $(CFILES:.c=.o)
 HFILES=sst.h
 DOCS = README sst-doc.xml sst.xml sst-layer.xsl TODO
@@ -17,6 +17,18 @@ SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
 
 all: sst sst.doc
 
+ai.o: ai.c sst.h
+battle.o: battle.c sst.h
+events.o: events.c sst.h
+finish.o: finish.c sst.h
+io.o: io.c sst.h
+moving.o: moving.c sstlinux.h sst.h
+planets.o: planets.c sst.h
+reports.o: reports.c sst.h
+setup.o: setup.c sst.h
+sst.o: sst.c sstlinux.h sst.h
+sstlinux.o: sstlinux.c sstlinux.h
+
 sst:  $(OFILES)
        gcc  -o sst $(OFILES) -lm -lcurses
 
@@ -26,12 +38,12 @@ sst.6: sst.xml
        xmlto man sst.xml
 
 sst-doc.txt: sst-doc.xml
-       xmlto -m sst-layer.xsl --skip-validation txt sst-doc.xml
+       xmlto -m sst-layer.xsl txt sst-doc.xml
 sst.doc: sst-doc.txt
        makehelp.py >sst.doc
 
 sst-doc.html: sst-doc.xml
-       xmlto --skip-validation xhtml-nochunks sst-doc.xml
+       xmlto xhtml-nochunks sst-doc.xml
 
 install: uninstall sst.6 sst.doc sst-doc.html 
        install -m 755 -o 0 -g 0 -d $(ROOT)/usr/bin/
@@ -50,13 +62,16 @@ clean:
        rm -f *.o sst sst-doc.html sst-doc.txt sst.doc
 
 # The "trunk" below assumes this is a Subversion working copy
-sst-$(VERS).tar.gz: $(SOURCES) sst.6
-       ls $(SOURCES) sst.6 | sed s:^:sst-$(VERS)/: >MANIFEST
-       (cd ..; ln -s trunk sst-$(VERS))
-       (cd ..; tar -czvf trunk/sst-$(VERS).tar.gz `cat trunk/MANIFEST`)
-       (cd ..; rm sst-$(VERS))
+sst-$(VERSION).tar.gz: $(SOURCES) sst.6
+       ls $(SOURCES) sst.6 | sed s:^:sst-$(VERSION)/: >MANIFEST
+       (cd ..; ln -s trunk sst-$(VERSION))
+       (cd ..; tar -czvf trunk/sst-$(VERSION).tar.gz `cat trunk/MANIFEST`)
+       (cd ..; rm sst-$(VERSION))
+
+dist: sst-$(VERSION).tar.gz
 
-dist: sst-$(VERS).tar.gz
+release: sst-$(VERSION).tar.gz sst.html
+       shipper; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
 
-release: sst-$(VERS).tar.gz sst.html
-       shipper -f; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
+version:
+       @echo $(VERSION)