credit_manager: use the proper header

[c128-kasse] / Makefile

diff --git a/Makefile b/Makefile
index ba5932a5a64c5686b5a718fb75659f3214b71388..cea7061a8957f87db5a4572b3c59419317a0a6dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,45 @@
-# Note: this are my paths to cc65 as there is no gentoo ebuild, sorry for that.
-# Please use the path below if you've installed cc65 system-wide
-#CC=~/customSoftware/cc65-2.11.0/src/cc65/cc65 -I ~/customSoftware/cc65-2.11.0/include
-#CA=~/customSoftware/cc65-2.11.0/src/ca65/ca65
-#CL=~/customSoftware/cc65-2.11.0/src/cl65/cl65
 CC=cc65
-CA=ca65
-CL=cl65
+AS=ca65
+LD=cl65
+INCLUDES:=$(wildcard include/*.h)
+GV:=$(shell git describe --tags --always)
 
-src/%.o: src/%.c include/%.h
-       ${CC} -O -I include -t c128 $<
-       ${CA} -I include -t c128 src/$$(basename $< .c).s
+CFLAGS += -DGV=\"${GV}\"
 
-test/%.o: test/%.c
-       ${CC} -O -I include -t c128 $<
-       ${CA} -I include -t c128 test/$$(basename $< .c).s
+%.o: %.c ${INCLUDES}
+       ${CC} ${CFLAGS} -O -I include -t c128 $< -o /dev/stdout | ${AS} -I include -t c128 /dev/stdin -o $@
+all: kasse itemz
 
-kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.o
-       # See above, please just kill the PATH-definition
-       # cp /tmp/cc65/lib/c128* .
-       PATH=${PATH}:~/customSoftware/cc65-2.11.0/src/ld65:/tmp/cc65/lib ${CL} -t c128 src/c128time.o src/config.o src/kasse.o src/general.o src/credit_manager.o -o kasse
+kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.o src/print.o
+       ${LD} -t c128 $^ -o $@
 
-itemz: src/config.o src/itemz.o src/general.o src/credit_manager.o
-       # See above, please just kill the PATH-definition
-       # cp /tmp/cc65/lib/c128* .
-       PATH=${PATH}:~/customSoftware/cc65-2.11.0/src/ld65:/tmp/cc65/lib ${CL} -t c128 src/config.o src/itemz.o src/general.o src/credit_manager.o -o itemz
+itemz: src/config.o src/itemz.o src/general.o src/credit_manager.o src/c128time.o src/print.o
+       ${LD} -t c128 $^ -o $@
 
 cat: src/general.o src/cat.o
-       ${CL} -t c128 src/general.o src/cat.o -o cat
-
-all: kasse itemz
+       ${LD} -t c128 $^ -o $@
 
 package: all
        cp images/kasse.d64 .
        c1541 -attach kasse.d64 -delete state || exit 0 
-       c1541 -attach kasse.d64 -delete items  || exit 0
-       c1541 -attach kasse.d64 -delete kasse  || exit 0
-       c1541 -attach kasse.d64 -delete itemz  || exit 0
-       c1541 -attach kasse.d64 -write kasse  || exit 0
-       c1541 -attach kasse.d64 -write itemz  || exit 0
+       c1541 -attach kasse.d64 -delete items || exit 0
+       c1541 -attach kasse.d64 -delete kasse || exit 0
+       c1541 -attach kasse.d64 -delete itemz || exit 0
+       c1541 -attach kasse.d64 -write kasse || exit 0
+       c1541 -attach kasse.d64 -write itemz || exit 0
 #      c1541 -attach kasse.d64 -write state || exit 0 
-#      c1541 -attach kasse.d64 -write items  || exit 0
+#      c1541 -attach kasse.d64 -write items || exit 0
 
 test: src/config.o test/test.o src/general.o
-       ${CL} -t c128 src/config.o test/test.o src/general.o -o test
+       cl65 -t c128 src/config.o test/test.o src/general.o -o test
 
 test-package: test
        c1541 -attach test.d64 -delete state || exit 0 
-       c1541 -attach test.d64 -delete items  || exit 0
-       c1541 -attach test.d64 -delete test  || exit 0
-       c1541 -attach test.d64 -write test  || exit 0
+       c1541 -attach test.d64 -delete items || exit 0
+       c1541 -attach test.d64 -delete test || exit 0
+       c1541 -attach test.d64 -write test || exit 0
        c1541 -attach test.d64 -write state || exit 0 
-       c1541 -attach test.d64 -write items  || exit 0
+       c1541 -attach test.d64 -write items || exit 0
 
 clean:
        rm -rf src/*.o src/*.s test/*.o test/*.s