projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repair dist slightly broken by previous commit.
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 7b81be6b418236e9f1b89b1b06f3c7e18ba56a01..848a676a59a92780521681ffc0e833d187cc163b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
# Makefile for the open-source release of adventure 2.5
# Makefile for the open-source release of adventure 2.5
-CC
=clang
-CCFLAGS=-
O2 -std=c99 -Wall -Wextra -Wpedantic -fstack-protector -fstack-protector-all -pipe -mtune=native
+CC
?=gcc
+CCFLAGS=-
std=c99
LIBS=
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
LIBS=
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
@@
-9,25
+9,26
@@
ifeq ($(UNAME_S),Linux)
endif
OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
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
+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:
.c.o:
- $(CC) $(CCFLAGS)
-O
$(DBX) -c $<
+ $(CC) $(CCFLAGS) $(DBX) -c $<
advent: $(OBJS) database.o
advent: $(OBJS) database.o
- $(CC) $(CCFLAGS)
-O
$(DBX) -o advent $(OBJS) $(LIBS)
+ $(CC) $(CCFLAGS) $(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
database.o: database.h
@@
-38,21
+39,24
@@
compile: compile.c
database.c database.h: compile adventure.text
./compile
database.c database.h: compile adventure.text
./compile
- $(CC) $(CCFLAGS) -O $(DBX) -c database.c
+ $(CC) $(CCFLAGS) $(DBX) -c database.c
+
+html: index.html advent.html history.html hints.html
clean:
clean:
- rm -f *.o advent
advent.html advent.6 database.[ch] compile
+ rm -f *.o advent
*.html advent.6 database.[ch] compile *.gcno *.gcda
cd tests; $(MAKE) --quiet clean
check: advent
cd tests; $(MAKE) --quiet
cd tests; $(MAKE) --quiet clean
check: advent
cd tests; $(MAKE) --quiet
+.SUFFIXES: .adoc .html
+
# Requires asciidoc and xsltproc/docbook stylesheets.
# Requires asciidoc and xsltproc/docbook stylesheets.
-.a
sc.6: advent.txt
+.a
doc.6: advent.adoc
a2x --doctype manpage --format manpage $<
a2x --doctype manpage --format manpage $<
-.asc.html: advent.txt
- 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
advent-$(VERS).tar.gz: $(SOURCES) advent.6
tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6
@@
-64,3
+68,6
@@
release: advent-$(VERS).tar.gz advent.html
refresh: advent.html
shipper -N -w version=$(VERS) | sh -e -x
refresh: advent.html
shipper -N -w version=$(VERS) | sh -e -x
+
+debug: CCFLAGS += -O0 --coverage
+debug: advent