projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync compile.c with misc.c.
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 22f1370edf6665e0db8547cdb0cf35b80751f9cf..b3500c36bd0f0cdb021936573c04de7e83f7cd8e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,38
+1,44
@@
# Makefile for the open-source release of adventure 2.5
# Makefile for the open-source release of adventure 2.5
-LIBS=-lrt
+CC?=gcc
+CCFLAGS=-std=c99 -O0 --coverage
+LIBS=
UNAME_S := $(shell uname -s)
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 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 advent
.text control
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent
ure.text advent.adoc control advent.h funcs.h
.c.o:
.c.o:
- $(CC)
-O
$(DBX) -c $<
+ $(CC)
$(CCFLAGS)
$(DBX) -c $<
-advent: $(OBJS)
- $(CC)
-Wall -std=c99 -O
$(DBX) -o advent $(OBJS) $(LIBS)
+advent: $(OBJS)
database.o
+ $(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.c database.h: compile
+database.o: database.h
+
+funcs.h: database.h
+
+compile: compile.c
+ $(CC) $(CCFLAGS) -o $@ $<
+
+database.c database.h: compile adventure.text
./compile
./compile
- $(CC) $(
OPTIONS) -O
$(DBX) -c database.c
+ $(CC) $(
CCFLAGS)
$(DBX) -c database.c
clean:
rm -f *.o advent advent.html advent.6 database.[ch] compile
clean:
rm -f *.o advent advent.html advent.6 database.[ch] compile
@@
-42,9
+48,9
@@
check: advent
cd tests; $(MAKE) --quiet
# Requires asciidoc and xsltproc/docbook stylesheets.
cd tests; $(MAKE) --quiet
# Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6:
+.asc.6:
advent.adoc
a2x --doctype manpage --format manpage $<
a2x --doctype manpage --format manpage $<
-.asc.html:
+.asc.html:
advent.adoc
a2x --doctype manpage --format xhtml -D . $<
rm -f docbook-xsl.css
a2x --doctype manpage --format xhtml -D . $<
rm -f docbook-xsl.css