X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=80f1c121d8bb52da8b147c869670d2597bce2c9d;hp=7b81be6b418236e9f1b89b1b06f3c7e18ba56a01;hb=f862f9f1d508e00bccc208e66b1d31a5e530ab3e;hpb=2620bf922f351a346f74210f2dc4f782cbc44486

diff --git a/Makefile b/Makefile
index 7b81be6..80f1c12 100644
--- a/Makefile
+++ b/Makefile
@@ -1,66 +1,125 @@
 # 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
+# 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
+#
+# If you are using MacPorts on OS X:
+# port install py3{5,6}-yaml as appropriate for your Python 3 version.
+#
+# To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
+
+VERS=1.0
+
+CC?=gcc
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -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) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
+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) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
+advent:	$(OBJS) linenoise.o newdb.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h database.h
+main.o:	 	advent.h database.h common.h newdb.h
 
-init.o:		misc.h main.h share.h funcs.h database.h
+init.o:	 	advent.h database.h common.h newdb.h
 
-actions1.o:	misc.h main.h share.h funcs.h database.h
+actions.o:	advent.h database.h common.h newdb.h
 
-actions2.o:	misc.h main.h share.h funcs.h
+score.o:	advent.h database.h common.h newdb.h
 
-score.o:	misc.h main.h share.h database.h
+misc.o:		advent.h database.h common.h newdb.h
 
-misc.o:		misc.h main.h database.h
+saveresume.o:	advent.h database.h common.h newdb.h
 
-database.o:	database.h
+common.o:	common.h
 
-funcs.h:	database.h
+newdb.o:	newdb.c newdb.h
+	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
-compile: compile.c
-	$(CC) $(CCFLAGS) -o $@ $<
+database.h: dungeon
+	./dungeon
 
-database.c database.h: compile adventure.text
-	./compile
-	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
+newdb.c newdb.h:
+	python3 newdungeon.py
+
+linenoise.o:	linenoise/linenoise.h
+	$(CC) -c linenoise/linenoise.c
+
+dungeon: dungeon.o common.o
+	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
 
 clean:
-	rm -f *.o advent advent.html advent.6 database.[ch] compile
+	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 *~
+	rm -f .*~
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
 
+.SUFFIXES: .adoc .html .6
+
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6: advent.txt
+.adoc.6:
 	a2x --doctype manpage --format manpage $<
-.asc.html: advent.txt
-	a2x --doctype manpage --format xhtml -D . $<
-	rm -f docbook-xsl.css
+.adoc.html:
+	asciidoc $<
+.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
+html: advent.html history.html hints.html
 
-dist: advent-$(VERS).tar.gz
+# README.adoc exists because that filename is magic on GitLab.
+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)
+	@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
+indent:
+	astyle -n -A3 --pad-header --min-conditional-indent=1 --pad-oper *.c
+
+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
+
+linty: CCFLAGS += -W -Wall -Wextra -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -Wfloat-equal -Wcast-align -Wwrite-strings -Waggregate-return -Wcast-qual -Wswitch-enum -Wwrite-strings -Wunreachable-code -Winit-self -Wpointer-arith -O2 
+linty: advent
+
+debug: CCFLAGS += -O0 --coverage -g
+debug: advent