Second round of merging Sergeev changes.

[super-star-trek.git] / makefile

diff --git a/makefile b/makefile
index b2ae6162c271ed1b87c4308844a527bc80e01ee1..d047666a9ceefa1aa5307bd5e504377dd6052595 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,12 +2,12 @@
 
 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 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 conio.c
 OFILES= $(CFILES:.c=.o)
 HFILES=sst.h
 DOCS = README sst-doc.xml sst.xml sst-layer.xsl TODO
@@ -23,7 +23,7 @@ sst:  $(OFILES)
 $(OFILES):  $(HFILES)
 
 sst.6: sst.xml
-       xmlto man sst.xml
+       xmlto --skip-validation man sst.xml
 
 sst-doc.txt: sst-doc.xml
        xmlto -m sst-layer.xsl --skip-validation txt sst-doc.xml