Simplify build: nested makefiles considered harmful.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 435adc4622adb602af320034fd342a494a97f263..5eab9d5288aa42ba0442dd19df776aa592b6f3b6 100644 (file)
--- 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]
        cd tests; $(MAKE) --quiet clean
-       cd database; $(MAKE) clean
 
 check: advent
        cd tests; $(MAKE) --quiet