Updates for the build machinery.

[super-star-trek.git] / makefile

diff --git a/makefile b/makefile
index 4aa098e9a51a91e5f8aa5335a86f5dbfaebfe95b..5865d6b1fac203e72426f9497e229079359126f6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 #      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= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
 
@@ -19,13 +19,12 @@ all: sst sst.doc
 
 ai.o: ai.c sst.h
 battle.o: battle.c sst.h
-conio.o: conio.c conio.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 conio.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
@@ -36,7 +35,7 @@ sst:  $(OFILES)
 $(OFILES):  $(HFILES)
 
 sst.6: sst.xml
-       xmlto --skip-validation man sst.xml
+       xmlto man sst.xml
 
 sst-doc.txt: sst-doc.xml
        xmlto -m sst-layer.xsl txt sst-doc.xml
@@ -63,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-$(VERS).tar.gz
+dist: sst-$(VERSION).tar.gz
 
-release: sst-$(VERS).tar.gz sst.html
-       shipper -f; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
+release: sst-$(VERSION).tar.gz sst.html
+       shipper; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST
+
+version:
+       @echo $(VERSION)