# Enter the target system here
SYS = c64
-CRT0 = ../libsrc/$(SYS).o
-CLIB = ../libsrc/$(SYS).lib
-CC = ../src/cc65/cc65
-CL = ../src/cl65/cl65
-AS = ../src/ca65/ca65
-LD = ../src/ld65/ld65
+# Determine the path to the executables and libraries. If the samples
+# directory is part of a complete source tree, use the stuff from this
+# source tree, otherwise use the "official" directories.
+ifeq "$(wildcard ../src)" ""
+# No source tree
+CLIB = $(SYS).lib
+CL = cl65
+CC = cc65
+AS = ca65
+LD = ld65
+
+else
+# Samples is part of a complete source tree
+CLIB = ../libsrc/$(SYS).lib
+CL = ../src/cl65/cl65
+CC = ../src/cc65/cc65
+AS = ../src/ca65/ca65
+LD = ../src/ld65/ld65
+export CC65_INC = ../include
+endif
+
+# This one comes with VICE
C1541 = c1541
# --------------------------------------------------------------------------
-# Rules how to make each one of the binaries
+# List of executables. This list could be made target dependent by checking
+# $(SYS).
+
+EXELIST = ascii \
+ diodemo \
+ fire \
+ gunzip65 \
+ hello \
+ mousedemo \
+ nachtm \
+ plasma \
+ sieve \
+ tgidemo
-EXELIST=ascii fire hello mousedemo nachtm plasma sieve tgidemo
+# --------------------------------------------------------------------------
+# Rules how to make each one of the binaries
.PHONY: all
all: $(EXELIST)
-ascii: $(CRT0) ascii.o $(CLIB)
- @$(LD) -t $(SYS) -m ascii.map -Ln ascii.lbl -o $@ $^
-
-fire: $(CRT0) fire.o $(CLIB)
- @$(LD) -t $(SYS) -m fire.map -Ln fire.lbl -o $@ $^
-
-hello: $(CRT0) hello.o $(CLIB)
- @$(LD) -t $(SYS) -m hello.map -Ln hello.lbl -o $@ $^
-
-mousedemo: $(CRT0) mousedemo.o $(CLIB)
- @$(LD) -t $(SYS) -m mousedemo.map -Ln mousedemo.lbl -o $@ $^
-
-nachtm: $(CRT0) nachtm.o $(CLIB)
- @$(LD) -t $(SYS) -vm -m nachtm.map -Ln nachtm.lbl -o $@ $^
-
-plasma: $(CRT0) plasma.o $(CLIB)
- @$(LD) -t $(SYS) -m plasma.map -Ln nachtm.lbl -o $@ $^
-
-sieve: $(CRT0) sieve.o $(CLIB)
- @$(LD) -t $(SYS) -m sieve.map -Ln sieve.lbl -o $@ $^
-
-tgidemo: $(CRT0) tgidemo.o $(CLIB)
- @$(LD) -t $(SYS) -m tgidemo.map -Ln tgidemo.lbl -o $@ $^
-
+ascii: ascii.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+diodemo: diodemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+fire: fire.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+gunzip65: gunzip65.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+hello: hello.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+# The Apple machines need the start address adjusted for the mandelbrot demo
+ifeq "$(SYS)" "apple2"
+mandelbrot: mandelbrot.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^
+else
+ifeq "$(SYS)" "apple2enh"
+mandelbrot: mandelbrot.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^
+else
+mandelbrot: mandelbrot.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+endif
+endif
+
+# The Apple ][ needs the start address adjusted for the mousedemo
+ifeq "$(SYS)" "apple2"
+mousedemo: mousedemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^
+else
+mousedemo: mousedemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+endif
+
+nachtm: nachtm.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -Ln $(basename $@).lbl -o $@ $^
+
+plasma: plasma.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+sieve: sieve.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+
+# The Apple machines need the start address adjusted for the tgidemo
+ifeq "$(SYS)" "apple2"
+tgidemo: tgidemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^
+else
+ifeq "$(SYS)" "apple2enh"
+tgidemo: tgidemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^
+else
+tgidemo: tgidemo.o $(CLIB)
+ @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+endif
+endif
# --------------------------------------------------------------------------
# Rule to make a disk with all samples. Needs the c1541 program that comes