Revert "Add explicit rule for compile to use CCFLAGS instead of CFLAGS"

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 4faf82ea40f51f9b0b092485107c304820b9d2f6..23cd7f9dc749be6bbb53eba1ade06e9a3fff154f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,21 @@
 # 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 --std=gnu99
+ifeq ($(UNAME_S),Linux)
+       LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+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
 
 .c.o:
        $(CC) $(CCFLAGS) -O $(DBX) -c $<
 
 advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+       $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
 
 main.o:                main.h misc.h funcs.h database.h
 
@@ -31,7 +29,11 @@ score.o:     misc.h main.h share.h database.h
 
 misc.o:                misc.h main.h database.h
 
-database.c database.h: compile
+database.o:    database.h
+
+funcs.h:       database.h
+
+database.c database.h: compile adventure.text
        ./compile
        $(CC) $(CCFLAGS) -O $(DBX) -c database.c
 
@@ -43,9 +45,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