Merge remote-tracking branch 'upstream/master' into movesamples

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test
+.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util
 
 .SUFFIXES:
 
@@ -7,6 +7,7 @@ all mostlyclean clean install zip:
 	@$(MAKE) -C libsrc  --no-print-directory $@
 	@$(MAKE) -C doc     --no-print-directory $@
 	@$(MAKE) -C samples --no-print-directory $@
+	@$(MAKE) -C util    --no-print-directory $@
 
 avail unavail bin:
 	@$(MAKE) -C src     --no-print-directory $@
@@ -23,6 +24,9 @@ samples:
 test:
 	@$(MAKE) -C test    --no-print-directory $@
 
+util:
+	@$(MAKE) -C util    --no-print-directory $@
+
 %65:
 	@$(MAKE) -C src     --no-print-directory $@
 

util/Makefile

@@ -0,0 +1,20 @@
+
+.PHONY: atari gamate zlib
+
+all: atari gamate zlib
+
+atari:
+	@$(MAKE) -C atari --no-print-directory $@
+gamate:
+	@$(MAKE) -C gamate --no-print-directory $@
+zlib:
+	@$(MAKE) -C zlib --no-print-directory $@
+
+mostlyclean clean:
+	@$(MAKE) -C atari --no-print-directory $@
+	@$(MAKE) -C gamate --no-print-directory $@
+	@$(MAKE) -C zlib --no-print-directory $@
+
+install zip:
+
+

util/atari/Makefile

@@ -0,0 +1,12 @@
+
+.PHONY: mostlyclean clean
+
+atari: ataricvt
+
+ataricvt: ataricvt.c
+	$(CC) $(CFLAGS) -o ataricvt ataricvt.c
+
+mostlyclean clean:
+	$(RM) ataricvt
+	
+install zip:

util/gamate/Makefile

@@ -0,0 +1,12 @@
+
+.PHONY: mostlyclean clean
+
+gamate: gamate-fixcart
+
+gamate-fixcart: gamate-fixcart.c
+	$(CC) $(CFLAGS) -o gamate-fixcart gamate-fixcart.c
+
+mostlyclean clean:
+	$(RM) gamate-fixcart
+	
+install zip:

util/zlib/Makefile

@@ -0,0 +1,17 @@
+
+.PHONY: mostlyclean clean
+
+zlib: warning
+#zlib: deflater
+
+warning:
+	@echo "deflater needs zlib installed, use 'make deflater' to build"
+
+deflater: deflater.c
+	$(CC) $(CFLAGS) -o deflater deflater.c -lz
+
+mostlyclean clean:
+	$(RM) deflater
+	
+install zip:
+