Honor external CCFLAGS and LDFLAGS

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 7a8468c88b24e2d0afd8fe8564f8d75f6a1f499d..291efd2a6f282d32b113c05a1584cb00dce6057e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for the open-source release of adventure 2.5
 
 CC?=gcc
-CCFLAGS=-std=c99 -O0 --coverage
+CCFLAGS+=-std=c99
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -9,14 +9,14 @@ ifeq ($(UNAME_S),Linux)
 endif
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
-DOCS=COPYING NEWS README TODO advent.adoc history.adoc index.adoc hints.adoc
-SOURCES=$(OBJS:.o=.c) advent.h funcs.h adventure.text $(DOCS) control
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc index.adoc hints.adoc
+SOURCES=$(OBJS:.o=.c) compile.c advent.h database.h funcs.h adventure.text $(DOCS) Makefile control
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LIBS)
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LDFLAGS) $(LIBS)
 
 main.o:                advent.h funcs.h database.h
 
@@ -41,6 +41,8 @@ database.c database.h: compile adventure.text
        ./compile
        $(CC) $(CCFLAGS) $(DBX) -c database.c
 
+html: index.html advent.html history.html hints.html
+
 clean:
        rm -f *.o advent *.html advent.6 database.[ch] compile *.gcno *.gcda
        cd tests; $(MAKE) --quiet clean
@@ -48,12 +50,13 @@ clean:
 check: advent
        cd tests; $(MAKE) --quiet
 
+.SUFFIXES: .adoc .html
+
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6: advent.adoc
+.adoc.6: advent.adoc
        a2x --doctype manpage --format manpage $<
-.asc.html: advent.adoc
-       a2x --doctype manpage --format xhtml -D . $<
-       rm -f docbook-xsl.css
+.adoc.html: advent.adoc
+       asciidoc $<
 
 advent-$(VERS).tar.gz: $(SOURCES) advent.6
        tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6
@@ -65,3 +68,6 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
        shipper -N -w version=$(VERS) | sh -e -x
+
+debug: CCFLAGS += -O0 --coverage
+debug: advent