Squasgh -Wextra warnings.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 67e321b4f4545e6cc1666b6767ae33d124e0ae8b..3c0e965e14bace008c5444111b57306bd6966fad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,77 @@
 # Makefile for the open-source release of adventure 2.5
 
+# Note: If you're building from the repository rather than the source tarball,
+# do this to get the linenoise library where you can use it:
+#
+# git submodule update --recursive --remote --init
+#
+# Therafter, you can update it like this:
+#
+# git submodule update --recursive --remote
+#
+# but this should seldom be necessary as that library is pretty stable.
+#
+# You will also need Python 3 YAML.  Under Debian or ubuntu:
+#
+# apt-get install python3-yaml
+#
+# If you have pip installed,
+#
+# pip3 install PyYAML
+
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -g
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
        LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
-SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
+OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile control linenoise/linenoise.[ch] newdungeon.py
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LDFLAGS) $(LIBS)
+advent:        $(OBJS) linenoise.o newdb.o
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
+
+main.o:                advent.h database.h common.h newdb.h
 
-main.o:                advent.h funcs.h database.h
+init.o:                advent.h database.h common.h newdb.h
 
-init.o:                advent.h funcs.h database.h
+actions.o:     advent.h database.h common.h
 
-actions1.o:    advent.h funcs.h database.h
+score.o:       advent.h database.h common.h newdb.h
 
-actions2.o:    advent.h funcs.h
+misc.o:                advent.h database.h common.h newdb.h
 
-score.o:       advent.h database.h
+saveresume.o:  advent.h database.h common.h
 
-misc.o:                advent.h database.h
+common.o:      common.h
 
-database.o:    database.h
+newdb.o:       newdb.c newdb.h
+       $(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
-funcs.h:       database.h
+database.h: dungeon
+       ./dungeon
 
-compile: compile.c
-       $(CC) $(CCFLAGS) -o $@ $<
+newdb.c newdb.h:
+       python3 newdungeon.py
 
-database.c database.h: compile adventure.text
-       ./compile
-       $(CC) $(CCFLAGS) $(DBX) -c database.c
+linenoise.o:   linenoise/linenoise.h
+       $(CC) -c linenoise/linenoise.c
 
-html: index.html advent.html history.html hints.html
+dungeon: dungeon.o common.o
+       $(CC) $(CCFLAGS) -o $@ dungeon.o common.o
 
 clean:
-       rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
-       rm -f README advent.6
+       rm -f *.o advent *.html database.h dungeon *.gcno *.gcda
+       rm -f newdb.c newdb.h
+       rm -f README advent.6 MANIFEST *.tar.gz
+       rm -f *~
        cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -62,14 +87,27 @@ check: advent
 .adoc:
        asciidoc $<
 
+html: advent.html history.html hints.html
+
 # README.adoc exists because that filename is magic on GitLab.
-DOCS=COPYING NEWS README.adoc TODO \
-       advent.adoc history.adoc index.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6
+TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
 
+# Can't use GNU tar's --transform, needs to build under Alpine Linux.
+# This is a requirement for testing dist in GitLab's CI pipeline
 advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
-       tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) $(DOCS)
+       @find $(SOURCES) $(DOCS) $(TESTFILES) -print | sed s:^:advent-$(VERS)/: >MANIFEST
+       @(ln -s . advent-$(VERS))
+       (tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
+       @(rm advent-$(VERS))
+
+release: advent-$(VERS).tar.gz advent.html history.html hints.html notes.html
+       shipper version=$(VERS) | sh -e -x
+
+refresh: advent.html
+       shipper -N -w version=$(VERS) | sh -e -x
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
+debug: CCFLAGS += -O0 --coverage -g
 debug: advent