X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=d4c82b53bdee1c1de777113f4ff4d32d956fc51b;hb=d2ad61cbe1896678df6c43c08c67b1d9b769e499;hp=435adc4622adb602af320034fd342a494a97f263;hpb=f0528b0ded7e921510ecdece2a36ce94c6414044;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 435adc4..d4c82b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,34 @@
 # 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 database/database.o
+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
 
 .c.o:
 	gcc -O $(DBX) -c $<
 
-advent:	$(OBJS) database
+advent:	$(OBJS)
 	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h database/database.h
+main.o:		main.h misc.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h database/database.h
+init.o:		misc.h main.h share.h funcs.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database/database.h
+actions1.o:	misc.h main.h share.h funcs.h database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h database/database.h
+score.o:	misc.h main.h share.h database.h
 
-misc.o:		misc.h main.h database/database.h
+misc.o:		misc.h main.h database.h
+
+database.c database.h: compile
+	./compile
+	gcc $(OPTIONS) -O $(DBX) -c database.c
 
 clean:
-	rm -f *.o advent advent.html advent.6 adventure.data
+	rm -f *.o advent advent.html advent.6 database.[ch] compile
 	cd tests; $(MAKE) --quiet clean
-	cd database; $(MAKE) clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
@@ -47,6 +50,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)