X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=ee8c567ccf1f17c18e04d75e277fb4d9783c5393;hb=41265e020c857fc87e6848941115210f3ea9b98d;hp=5ac6c6473da18b47f37d1b500b02fb1d89fec576;hpb=3da812fdf6691a740d7f7247872e5c49323cabf7;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 5ac6c64..ee8c567 100644
--- a/Makefile
+++ b/Makefile
@@ -3,46 +3,50 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
 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
-SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o linenoise.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) database.o
+advent: $(OBJS) database.o
 	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
-main.o:		advent.h funcs.h database.h
+main.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-init.o:		advent.h funcs.h database.h
+init.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-actions1.o:	advent.h funcs.h database.h
+actions1.o:     advent.h funcs.h database.h database.c sizes.h
 
-actions2.o:	advent.h funcs.h
+actions2.o:     advent.h funcs.h database.h database.c sizes.h
 
-score.o:	advent.h database.h
+score.o:	advent.h database.h database.c sizes.h
 
-misc.o:		advent.h database.h
+misc.o:	 advent.h database.h database.c sizes.h
 
-database.o:	database.h
+database.o:     database.c database.h sizes.h
+	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
-compile: compile.c
-	$(CC) $(CCFLAGS) -o $@ $<
+database.c database.h: dungeon
+	./dungeon
 
-database.c database.h: compile adventure.text
-	./compile
-	$(CC) $(CCFLAGS) $(DBX) -c database.c
+linenoise.o:	linenoise/linenoise.h
+	$(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
+
+dungeon: dungeon.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
 clean:
-	rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
+	rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda
 	rm -f README advent.6 MANIFEST *.tar.gz
+	rm -f *~
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -66,7 +70,7 @@ DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
 # 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)
-	@ls $(SOURCES) $(DOCS) tests | sed s:^:advent-$(VERS)/: >MANIFEST
+	@find $(SOURCES) $(DOCS) tests -print | sed s:^:advent-$(VERS)/: >MANIFEST
 	@(ln -s . advent-$(VERS))
 	(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
 	@(rm advent-$(VERS))