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

[c128-kasse] / Makefile

diff --git a/Makefile b/Makefile
index cea7061a8957f87db5a4572b3c59419317a0a6dd..812283a9f1d931e0ad5daabe41c2a8faf68df2a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,21 @@
 CC=cc65
 AS=ca65
 LD=cl65
-INCLUDES:=$(wildcard include/*.h)
+INCLUDES:=$(wildcard include/*.h) include/version.h
 GV:=$(shell git describe --tags --always)
+CFLAGS= -I include -t c128
 
-CFLAGS += -DGV=\"${GV}\"
+.PHONY: include/version.h clean dist-clean format
 
-%.o: %.c ${INCLUDES}
-       ${CC} ${CFLAGS} -O -I include -t c128 $< -o /dev/stdout | ${AS} -I include -t c128 /dev/stdin -o $@
 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 $@
 
@@ -20,29 +26,26 @@ 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:
        rm -rf src/*.o src/*.s test/*.o test/*.s
-       
+
 dist-clean: clean
-       rm kasse itemz kasse.d64
+       rm -f kasse itemz kasse.d64
+
+format:
+       clang-format-3.9 -i **/*.[ch]