X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=435adc4622adb602af320034fd342a494a97f263;hb=7e82c2f910b5ac1a9b9bb5b07741b3418423b27b;hp=aef58baedcdf3cd31a02bcc61fc040bce1b12800;hpb=894724d1c844f769a4a7a67047adf82bcbd8ad75;p=open-adventure.git

diff --git a/Makefile b/Makefile
index aef58ba..435adc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,33 @@
 # Makefile for the open-source release of adventure 2.5
 
 LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o database/database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
 .c.o:
 	gcc -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	gcc -O $(DBX) -o advent $(OBJS) $(LIBS)
+advent:	$(OBJS) database
+	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		misc.h funcs.h
+main.o:		main.h misc.h funcs.h database/database.h
 
-init.o:		misc.h main.h share.h funcs.h
+init.o:		misc.h main.h share.h funcs.h database/database.h
 
-actions1.o:	misc.h main.h share.h funcs.h
+actions1.o:	misc.h main.h share.h funcs.h database/database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h
+score.o:	misc.h main.h share.h database/database.h
 
-misc.o:		misc.h main.h
+misc.o:		misc.h main.h database/database.h
 
 clean:
 	rm -f *.o advent advent.html advent.6 adventure.data
+	cd tests; $(MAKE) --quiet clean
+	cd database; $(MAKE) clean
 
-check:
+check: advent
 	cd tests; $(MAKE) --quiet
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
@@ -45,3 +47,6 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
+
+database:
+	cd database; $(MAKE)