From 32a66c5d7c81c4966e1ef0b810f5c8d4e3f5912a Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Sat, 4 Nov 2017 00:40:35 +0100
Subject: [PATCH] Moved httpd.slotscan to ip65test.dsk and dropped
 ip65demo.dsk.

Now that with Telnet65 there is a "real" application there's no point anymore in the
ip65demo.dsk. Therefore httpd.slotscan is now part of the ordinary ip65test.dsk.
---
 test/Makefile | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index c70acd1..c6b78c2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -55,6 +55,8 @@ $(addsuffix .vicprg,$(TCP)): IP65LIB = ../ip65/ip65_tcp.lib
 
 $(foreach pgm,$(UDP) $(TCP),$(eval $(pgm): $(pgm).prg $(pgm).bin $(pgm).com $(pgm).vicprg))
 
+httpd-slotscan.bin: IP65LIB = ../ip65/ip65_tcp.lib
+
 INCFILES =\
   ../inc/common.i \
   ../inc/commonprint.i \
@@ -62,7 +64,7 @@ INCFILES =\
 
 prg: $(addsuffix .prg,$(UDP) $(TCP))
 
-bin: $(addsuffix .bin,$(UDP) $(TCP))
+bin: $(addsuffix .bin,$(UDP) $(TCP)) httpd-slotscan.bin
 
 com: $(addsuffix .com,$(UDP) $(TCP))
 
@@ -86,6 +88,9 @@ vt100.com: ATARI_CFG = ../apps/atrtelnet.cfg
 %.o: %.s
 	ca65 $<
 
+%-slotscan.o: %.s
+	ca65 -D A2_SLOT_SCAN -o $@ $<
+
 %.prg: %.o ip65 drivers $(INCFILES)
 	ld65 -o $*.prg -C c64.cfg -m $*.c64.map -vm $< $(IP65LIB) $(C64DRIVERLIB) c64.lib
 
@@ -113,16 +118,17 @@ ip65test.d64: prg
 
 ip65test.dsk: bin
 	cp prodos.dsk $@
-	java -jar $(AC) -cc65 $@ dns        bin < dns.bin
-	java -jar $(AC) -cc65 $@ dottedquad bin < dottedquad.bin
-	java -jar $(AC) -cc65 $@ geturl     bin < geturl.bin
-	java -jar $(AC) -cc65 $@ httpd      bin < httpd.bin
-	java -jar $(AC) -cc65 $@ math       bin < math.bin
-	java -jar $(AC) -cc65 $@ parser     bin < parser.bin
-	java -jar $(AC) -cc65 $@ ping       bin < ping.bin
-	java -jar $(AC) -cc65 $@ sntp       bin < sntp.bin
-	java -jar $(AC) -cc65 $@ tftp       bin < tftp.bin
-	java -jar $(AC) -cc65 $@ vt100      bin < vt100.bin
+	java -jar $(AC) -cc65 $@ dns            bin < dns.bin
+	java -jar $(AC) -cc65 $@ dottedquad     bin < dottedquad.bin
+	java -jar $(AC) -cc65 $@ geturl         bin < geturl.bin
+	java -jar $(AC) -cc65 $@ httpd          bin < httpd.bin
+	java -jar $(AC) -cc65 $@ httpd.slotscan bin < httpd-slotscan.bin
+	java -jar $(AC) -cc65 $@ math           bin < math.bin
+	java -jar $(AC) -cc65 $@ parser         bin < parser.bin
+	java -jar $(AC) -cc65 $@ ping           bin < ping.bin
+	java -jar $(AC) -cc65 $@ sntp           bin < sntp.bin
+	java -jar $(AC) -cc65 $@ tftp           bin < tftp.bin
+	java -jar $(AC) -cc65 $@ vt100          bin < vt100.bin
 
 ip65test.atr: com
 	mkdir atr
@@ -141,19 +147,8 @@ ip65test.atr: com
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
-%-slotscan.o: %.s
-	ca65 -D A2_SLOT_SCAN -o $@ $<
-
-httpd-slotscan.bin: IP65LIB = ../ip65/ip65_tcp.lib
-
-ip65demo.dsk: httpd.bin httpd-slotscan.bin
-	cp prodos.dsk $@
-	java -jar $(AC) -cc65 $@ httpd.slot3    bin < httpd.bin
-	java -jar $(AC) -cc65 $@ httpd.slotscan bin < httpd-slotscan.bin
-
 clean:
 	make -C ../ip65 clean
 	make -C ../drivers clean
-	-rm -f ../supplement/*.o
 	-rm -f *.o *.prg *.bin *.com *.vicprg *.map
-	-rm -f ip65test.d64 ip65test.dsk ip65test.atr ip65demo.dsk
+	-rm -f ip65test.d64 ip65test.dsk ip65test.atr