Merge pull request #11 from 9b17fe/remove-dual-monitor

[c128-kasse] / Makefile

diff --git a/Makefile b/Makefile
index af0909d1e6dd61b5684b9c4ecb0416984f67ebe3..812283a9f1d931e0ad5daabe41c2a8faf68df2a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ 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
+.PHONY: include/version.h clean dist-clean format
 
 all: kasse itemz
 
@@ -26,25 +26,19 @@ cat: src/general.o src/cat.o
        ${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 -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: 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 -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 state || exit 0
        c1541 -attach test.d64 -write items || exit 0
 
 clean:
@@ -52,3 +46,6 @@ clean:
 
 dist-clean: clean
        rm -f kasse itemz kasse.d64
+
+format:
+       clang-format-3.9 -i **/*.[ch]