Second round of merging Sergeev changes.

[super-star-trek.git] / makefile

diff --git a/makefile b/makefile
index 0a0f9ffc185bb3c9959c2ec1c9649fef82f2ce32..d047666a9ceefa1aa5307bd5e504377dd6052595 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,15 +2,15 @@
 
 VERS=$(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 linux.c moving.c battle.c events.c ai.c planets.c
+CFILES= sst.c finish.c reports.c setup.c moving.c battle.c events.c ai.c planets.c io.c sstlinux.c conio.c
 OFILES= $(CFILES:.c=.o)
 HFILES=sst.h
-DOCS = README sst-doc.xml sst.xml TODO
+DOCS = README sst-doc.xml sst.xml sst-layer.xsl TODO
 
 # sst.doc and sst.6 are included so target system won't need xmlto
 SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
@@ -18,15 +18,15 @@ SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
 all: sst sst.doc
 
 sst:  $(OFILES)
-       gcc  -o sst $(OFILES) -lm
+       gcc  -o sst $(OFILES) -lm -lcurses
 
 $(OFILES):  $(HFILES)
 
 sst.6: sst.xml
-       xmlto man sst.xml
+       xmlto --skip-validation man sst.xml
 
 sst-doc.txt: sst-doc.xml
-       xmlto --skip-validation txt sst-doc.xml
+       xmlto -m sst-layer.xsl --skip-validation txt sst-doc.xml
 sst.doc: sst-doc.txt
        makehelp.py >sst.doc