Add explicit rule for compile to use CCFLAGS instead of CFLAGS (take two)

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 35b097ba1cf64f46f24487ec1b652eb34da090a3..c2f34d48f62db23405b85061bbe045e4a7d1c367 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,11 @@
 # 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
@@ -35,6 +33,9 @@ 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