Merge pull request #12 from stapelberg/builddir

Makefile: place *.{o,s} in build/

diff --git a/.gitignore b/.gitignore
index 55278d35b7fddfce602ca81f538485e16399e3e9..7ffcf3d3d59e68b5dc69dec3ceb66cce9fdbbf77 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ itemz
 include/version.h
 tags
 items
+cat
+*.lbl

diff --git a/Makefile b/Makefile
index 812283a9f1d931e0ad5daabe41c2a8faf68df2a4..f3d0577ea72e2c2d4d7ab43995f947b4468c5347 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,28 @@ AS=ca65
 LD=cl65
 INCLUDES:=$(wildcard include/*.h) include/version.h
 GV:=$(shell git describe --tags --always)
-CFLAGS= -I include -t c128
+CFLAGS= -I include -t c128 -g
 
 .PHONY: include/version.h clean dist-clean format
 
-all: kasse itemz
+all: kasse itemz cat
 
-%.o: %.c ${INCLUDES}
-       ${CC} ${CFLAGS} -O $<
-       ${AS} ${CFLAGS} $(addsuffix .s,$(basename $< ))
+build/%.o: src/%.c ${INCLUDES}
+       ${CC} ${CFLAGS} -O $< -o build/$(addsuffix .s,$(shell basename $< .c))
+       ${AS} ${CFLAGS} build/$(addsuffix .s,$(shell basename $< .c)) -o $@
 
 include/version.h:
+       mkdir -p build
        echo "#define GV \"${GV}\"" > $@
 
-kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.o src/print.o
-       ${LD} -t c128 $^ -o $@
+kasse: build/config.o build/kasse.o build/general.o build/credit_manager.o build/c128time.o build/print.o
+       ${LD} -Ln $@.lbl -t c128 $^ -o $@
 
-itemz: src/config.o src/itemz.o src/general.o src/credit_manager.o src/c128time.o src/print.o
-       ${LD} -t c128 $^ -o $@
+itemz: build/config.o build/itemz.o build/general.o build/credit_manager.o build/c128time.o build/print.o
+       ${LD} -Ln $@.lbl -t c128 $^ -o $@
 
-cat: src/general.o src/cat.o
-       ${LD} -t c128 $^ -o $@
+cat: build/general.o build/cat.o
+       ${LD} -Ln $@.lbl -t c128 $^ -o $@
 
 package: all
        c1541 -format "${GV}",KA d64 kasse.d64
@@ -32,8 +33,8 @@ package: all
        [ -e state ] && c1541 -attach kasse.d64 -write state || exit 0
        [ -e items ] && c1541 -attach kasse.d64 -write items || exit 0
 
-test: src/config.o test/test.o src/general.o
-       cl65 -t c128 src/config.o test/test.o src/general.o -o test
+test: build/config.o test/test.o build/general.o
+       cl65 -t c128 $^ -o build/test
 
 test-package: test
        c1541 -format "test",TE d64 test.d64
@@ -42,10 +43,10 @@ test-package: test
        c1541 -attach test.d64 -write items || exit 0
 
 clean:
-       rm -rf src/*.o src/*.s test/*.o test/*.s
+       rm -rf build/*.o build/*.s test/*.o test/*.s
 
 dist-clean: clean
-       rm -f kasse itemz kasse.d64
+       rm -f kasse kasse.lbl itemz itemz.lbl cat cat.lbl kasse.d64
 
 format:
        clang-format-3.9 -i **/*.[ch]