diff --git a/accelerators/zipchip/Makefile b/accelerators/zipchip/Makefile index eed1a65..69740b1 100644 --- a/accelerators/zipchip/Makefile +++ b/accelerators/zipchip/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc) diff --git a/clocks/cricket/Makefile b/clocks/cricket/Makefile index caff7f2..7cf4122 100644 --- a/clocks/cricket/Makefile +++ b/clocks/cricket/Makefile @@ -2,17 +2,18 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out +UTILDIR = $(OUTDIR)/cricket.util HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) TARGETS = \ - $(OUTDIR)/prodos.mod.BIN \ + $(UTILDIR)/prodos.mod.BIN \ $(OUTDIR)/cricket.system.SYS \ - $(OUTDIR)/test.BIN \ - $(OUTDIR)/set.datetime.BIN \ - $(OUTDIR)/set.time.BIN \ - $(OUTDIR)/set.date.BIN + $(UTILDIR)/test.BIN \ + $(UTILDIR)/set.datetime.BIN \ + $(UTILDIR)/set.time.BIN \ + $(UTILDIR)/set.date.BIN LOG_SUCCESS=1 LOG_FAILURE=1 @@ -27,20 +28,25 @@ DEFINES = -D DD=$(DD) -D MM=$(MM) -D YY=$(YY) \ XATTR := $(shell command -v xattr 2> /dev/null) .PHONY: clean all -all: $(OUTDIR) $(TARGETS) +all: $(OUTDIR) $(UTILDIR) $(TARGETS) -$(OUTDIR): - mkdir -p $(OUTDIR) +$(OUTDIR) $(UTILDIR): + mkdir -p $@ clean: rm -f $(OUTDIR)/*.o rm -f $(OUTDIR)/*.list + rm -f $(UTILDIR)/*.o + rm -f $(UTILDIR)/*.list rm -f $(TARGETS) -$(OUTDIR)/%.o: %.s $(HEADERS) +$(OUTDIR)/%.o $(UTILDIR)/%.o: %.s $(HEADERS) ca65 $(CAFLAGS) $(DEFINES) --listing $(basename $@).list -o $@ $< -$(OUTDIR)/%.BIN $(OUTDIR)/%.SYS: $(OUTDIR)/%.o +$(OUTDIR)/%.SYS: $(OUTDIR)/%.o + ld65 $(LDFLAGS) -o $@ $< + +$(UTILDIR)/%.BIN: $(UTILDIR)/%.o ld65 $(LDFLAGS) -o $@ $< ifdef XATTR xattr -wx prodos.AuxType '00 20' $@ diff --git a/clocks/dclock/Makefile b/clocks/dclock/Makefile index 350a1e5..a7ce57e 100644 --- a/clocks/dclock/Makefile +++ b/clocks/dclock/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) diff --git a/clocks/fujinet/Makefile b/clocks/fujinet/Makefile index fb287a1..065d686 100644 --- a/clocks/fujinet/Makefile +++ b/clocks/fujinet/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) diff --git a/clocks/jumbo/Makefile b/clocks/jumbo/Makefile index 52469f4..f650d20 100644 --- a/clocks/jumbo/Makefile +++ b/clocks/jumbo/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) \ ../ns.clock/ns.clock.system.s \ diff --git a/clocks/ns.clock/Makefile b/clocks/ns.clock/Makefile index 1a809a0..87fb954 100644 --- a/clocks/ns.clock/Makefile +++ b/clocks/ns.clock/Makefile @@ -2,13 +2,14 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out +UTILDIR = $(OUTDIR)/nsclock.util HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) TARGETS = \ $(OUTDIR)/ns.clock.system.SYS \ - $(OUTDIR)/set.datetime.BIN + $(UTILDIR)/set.datetime.BIN LOG_SUCCESS=1 LOG_FAILURE=1 @@ -23,20 +24,25 @@ DEFINES = -D DD=$(DD) -D MM=$(MM) -D YY=$(YY) \ XATTR := $(shell command -v xattr 2> /dev/null) .PHONY: clean all -all: $(OUTDIR) $(TARGETS) +all: $(OUTDIR) $(UTILDIR) $(TARGETS) -$(OUTDIR): - mkdir -p $(OUTDIR) +$(OUTDIR) $(UTILDIR): + mkdir -p $@ clean: rm -f $(OUTDIR)/*.o rm -f $(OUTDIR)/*.list + rm -f $(UTILDIR)/*.o + rm -f $(UTILDIR)/*.list rm -f $(TARGETS) -$(OUTDIR)/%.o: %.s $(HEADERS) +$(OUTDIR)/%.o $(UTILDIR)/%.o: %.s $(HEADERS) ca65 $(CAFLAGS) $(DEFINES) --listing $(basename $@).list -o $@ $< -$(OUTDIR)/%.BIN $(OUTDIR)/%.SYS: $(OUTDIR)/%.o +$(OUTDIR)/%.SYS: $(OUTDIR)/%.o + ld65 $(LDFLAGS) -o $@ $< + +$(UTILDIR)/%.BIN: $(UTILDIR)/%.o ld65 $(LDFLAGS) -o $@ $< ifdef XATTR xattr -wx prodos.AuxType '00 20' $@ diff --git a/clocks/romx/Makefile b/clocks/romx/Makefile index c27fd05..04008c7 100644 --- a/clocks/romx/Makefile +++ b/clocks/romx/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../../out HEADERS = $(wildcard *.inc) $(wildcard ../../inc/*.inc) diff --git a/package.sh b/package.sh index 674e486..cd81957 100755 --- a/package.sh +++ b/package.sh @@ -19,31 +19,31 @@ add_file () { cadius ADDFILE "$IMGFILE" "$3" "$PACKDIR/$2" --no-case-bits --quiet } -add_file "clocks/cricket/out/cricket.system.SYS" "cricket.system#FF0000" "/$VOLNAME" -add_file "clocks/cricket/out/set.datetime.BIN" "set.datetime#062000" "/$VOLNAME/CRICKET.UTIL" -add_file "clocks/cricket/out/set.date.BIN" "set.date#062000" "/$VOLNAME/CRICKET.UTIL" -add_file "clocks/cricket/out/set.time.BIN" "set.time#062000" "/$VOLNAME/CRICKET.UTIL" -add_file "clocks/cricket/out/test.BIN" "test#062000" "/$VOLNAME/CRICKET.UTIL" -add_file "clocks/dclock/out/dclock.system.SYS" "dclock.system#FF0000" "/$VOLNAME" -add_file "clocks/ns.clock/out/ns.clock.system.SYS" "ns.clock.system#FF0000" "/$VOLNAME" -add_file "clocks/ns.clock/out/set.datetime.BIN" "set.datetime#062000" "/$VOLNAME/NSCLOCK.UTIL" -add_file "clocks/romx/out/romxrtc.system.SYS" "romxrtc.system#FF0000" "/$VOLNAME" -add_file "clocks/fujinet/out/fn.clock.system.SYS" "fn.clock.system#FF0000" "/$VOLNAME" -add_file "clocks/jumbo/out/clock.system.SYS" "clock.system#FF0000" "/$VOLNAME" -add_file "ram.drv/out/ram.drv.system.SYS" "ram.drv.system#FF0000" "/$VOLNAME" -add_file "selectors/out/bbb.system.SYS" "bbb.system#FF0000" "/$VOLNAME" -add_file "selectors/out/buhbye.system.SYS" "buhbye.system#FF0000" "/$VOLNAME" -add_file "selectors/out/bye.system.SYS" "bye.system#FF0000" "/$VOLNAME" -add_file "selectors/out/selector.system.SYS" "selector.system#FF0000" "/$VOLNAME" -add_file "accelerators/zipchip/out/zipchip.system.SYS" "zipchip.system#FF0000" "/$VOLNAME" -add_file "util/out/quit.system.SYS" "quit.system#FF0000" "/$VOLNAME" -add_file "util/out/pause.system.SYS" "pause.system#FF0000" "/$VOLNAME" -add_file "util/out/me.first.system.SYS" "me.first.system#FF0000" "/$VOLNAME" -add_file "util/out/date.BIN" "date#062000" "/$VOLNAME" +add_file "out/cricket.system.SYS" "cricket.system#FF0000" "/$VOLNAME" +add_file "out/cricket.util/set.datetime.BIN" "set.datetime#062000" "/$VOLNAME/CRICKET.UTIL" +add_file "out/cricket.util/set.date.BIN" "set.date#062000" "/$VOLNAME/CRICKET.UTIL" +add_file "out/cricket.util/set.time.BIN" "set.time#062000" "/$VOLNAME/CRICKET.UTIL" +add_file "out/cricket.util/test.BIN" "test#062000" "/$VOLNAME/CRICKET.UTIL" +add_file "out/dclock.system.SYS" "dclock.system#FF0000" "/$VOLNAME" +add_file "out/ns.clock.system.SYS" "ns.clock.system#FF0000" "/$VOLNAME" +add_file "out/nsclock.util/set.datetime.BIN" "set.datetime#062000" "/$VOLNAME/NSCLOCK.UTIL" +add_file "out/romxrtc.system.SYS" "romxrtc.system#FF0000" "/$VOLNAME" +add_file "out/fn.clock.system.SYS" "fn.clock.system#FF0000" "/$VOLNAME" +add_file "out/clock.system.SYS" "clock.system#FF0000" "/$VOLNAME" +add_file "out/ram.drv.system.SYS" "ram.drv.system#FF0000" "/$VOLNAME" +add_file "out/bbb.system.SYS" "bbb.system#FF0000" "/$VOLNAME" +add_file "out/buhbye.system.SYS" "buhbye.system#FF0000" "/$VOLNAME" +add_file "out/bye.system.SYS" "bye.system#FF0000" "/$VOLNAME" +add_file "out/selector.system.SYS" "selector.system#FF0000" "/$VOLNAME" +add_file "out/zipchip.system.SYS" "zipchip.system#FF0000" "/$VOLNAME" +add_file "out/quit.system.SYS" "quit.system#FF0000" "/$VOLNAME" +add_file "out/pause.system.SYS" "pause.system#FF0000" "/$VOLNAME" +add_file "out/me.first.system.SYS" "me.first.system#FF0000" "/$VOLNAME" +add_file "out/date.BIN" "date#062000" "/$VOLNAME" cadius CREATEFOLDER "$IMGFILE" "/$VOLNAME/TEXTCOLORS" --no-case-bits --quiet for file in a2green bw deepblue gray gsblue mint pink wb; do - add_file "textcolors/out/${file}.system.SYS" "${file}.system#FF0000" "/$VOLNAME/TEXTCOLORS" + add_file "out/${file}.system.SYS" "${file}.system#FF0000" "/$VOLNAME/TEXTCOLORS" done rm -r "$PACKDIR" diff --git a/ram.drv/Makefile b/ram.drv/Makefile index 0ee52ef..7c4111c 100644 --- a/ram.drv/Makefile +++ b/ram.drv/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../out HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc) diff --git a/selectors/Makefile b/selectors/Makefile index 2acc526..b68b9a2 100644 --- a/selectors/Makefile +++ b/selectors/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../out HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc) diff --git a/textcolors/Makefile b/textcolors/Makefile index 7d80bd8..de9cd81 100644 --- a/textcolors/Makefile +++ b/textcolors/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../out HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc) diff --git a/util/Makefile b/util/Makefile index 17862d5..7de4f18 100644 --- a/util/Makefile +++ b/util/Makefile @@ -2,7 +2,7 @@ CAFLAGS = --target apple2enh --list-bytes 0 LDFLAGS = --config apple2-asm.cfg -OUTDIR = out +OUTDIR = ../out HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc)