Header consolidation - main.h, misc.h, and share.h merge to advent.h.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 35b097ba1cf64f46f24487ec1b652eb34da090a3..bdd19debe3088f556a37f46fb58b1ab6f62ebb3c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
 # Makefile for the open-source release of adventure 2.5
 
+CC?=gcc
 CCFLAGS=-std=c99
-LIBS=-lrt
+LIBS=
 UNAME_S := $(shell uname -s)
-GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
-ifeq ($(UNAME_S),Darwin)
-       LIBS=
-else ifeq "$(GCCVERSIONGTEQ4)" "1"
-       CC=c99
+ifeq ($(UNAME_S),Linux)
+       LIBS=-lrt
 endif
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control advent.h funcs.h
 
 .c.o:
        $(CC) $(CCFLAGS) -O $(DBX) -c $<
@@ -19,22 +17,25 @@ SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text contro
 advent:        $(OBJS) database.o
        $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:                main.h misc.h funcs.h database.h
+main.o:                advent.h funcs.h database.h
 
-init.o:                misc.h main.h share.h funcs.h database.h
+init.o:                advent.h funcs.h database.h
 
-actions1.o:    misc.h main.h share.h funcs.h database.h
+actions1.o:    advent.h funcs.h database.h
 
-actions2.o:    misc.h main.h share.h funcs.h
+actions2.o:    advent.h funcs.h
 
-score.o:       misc.h main.h share.h database.h
+score.o:       advent.h database.h
 
-misc.o:                misc.h main.h database.h
+misc.o:                advent.h database.h
 
 database.o:    database.h
 
 funcs.h:       database.h
 
+compile: compile.c
+       $(CC) $(CCFLAGS) -o $@ $<
+
 database.c database.h: compile adventure.text
        ./compile
        $(CC) $(CCFLAGS) -O $(DBX) -c database.c
@@ -47,9 +48,9 @@ check: advent
        cd tests; $(MAKE) --quiet
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6:
+.asc.6: advent.txt
        a2x --doctype manpage --format manpage $<
-.asc.html:
+.asc.html: advent.txt
        a2x --doctype manpage --format xhtml -D . $<
        rm -f docbook-xsl.css