X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=7c4a2027fce189fbb164ad42d4383d4363492f7a;hb=7a813b2161441c353ba6e2966d1c88fbb5a1fc6e;hp=922402868f775dbe35d8a4f4c94838dca243f140;hpb=4df0938639f51965ccebe9fc9522ccb820cf95a2;p=c128-kasse

diff --git a/Makefile b/Makefile
index 9224028..7c4a202 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,48 @@
-# 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
-
-src/%.o: src/%.c include/%.h
-	${CC} -I include -t c128 $<
-	${CA} -I include -t c128 src/$$(basename $< .c).s
-
-all: src/config.o src/kasse.o src/general.o src/credit_manager.o src/time.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 -O src/*.o -o kasse
+CC=cc65
+AS=ca65
+LD=cl65
+INCLUDES:=$(wildcard include/*.h) include/version.h
+GV:=$(shell git describe --tags --always)
+CFLAGS= -I include -t c128
+
+.PHONY: include/version.h clean dist-clean
+
+all: kasse itemz
+
+%.o: %.c ${INCLUDES}
+	${CC} ${CFLAGS} -O $<
+	${AS} ${CFLAGS} $(addsuffix .s,$(basename $< ))
+
+include/version.h:
+	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 $@
+
+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
+	${LD} -t c128 $^ -o $@
 
 package: all
-	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 -write kasse  || exit 0
-	c1541 -attach kasse.d64 -write state || exit 0 
-	c1541 -attach kasse.d64 -write items  || exit 0
+	c1541 -format "${GV}",KA d64 kasse.d64
+	c1541 -attach kasse.d64 -write kasse
+	c1541 -attach kasse.d64 -write itemz
+	[ -e state ] && c1541 -attach kasse.d64 -write state || exit 0
+	[ -e items ] && c1541 -attach kasse.d64 -write items || exit 0
 
-test: config.o test.o general.o
-	${CL} -t c128 config.o test.o general.o -o test
+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-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 -write state || exit 0 
-	c1541 -attach test.d64 -write items  || exit 0
+	c1541 -format "test",TE d64 test.d64
+	c1541 -attach test.d64 -write test || exit 0
+	c1541 -attach test.d64 -write state || exit 0
+	c1541 -attach test.d64 -write items || exit 0
 
 clean:
-	rm -rf src/*.o src/*.s
-	
+	rm -rf src/*.o src/*.s test/*.o test/*.s
+
 dist-clean: clean
-	rm kasse test 
+	rm -f kasse itemz kasse.d64