Reorganize project and move all code into src directory, build products to build directory.

Author: willisblackburn

.gitignore

@@ -1,22 +1,10 @@
 .vscode
 .DS_Store
 *.code-workspace
-*.o
-*.d
-*.dbg
-*.map
-basic_ac6502
-basic_apple2
-basic_apple2_lc
-basic_atari
-basic_sim6502
-basic_vc83_serial
-basic_vc83_serial.mem
-*_test
-*_test.s
-constants.inc
-constants.h
-zeropage.inc
-zeropage.h
-zeropage.s
-version.inc
+build/
+src/constants.inc
+src/constants.h
+src/zeropage.inc
+src/zeropage.h
+src/zeropage.s
+src/version.inc

Makefile

@@ -8,8 +8,8 @@ TEST_TARGET = sim6502
 TESTS = $(notdir $(basename $(wildcard tests/*_test.c)))
 EXPECT_TESTS = $(notdir $(basename $(wildcard expect_tests/*.exp)))
 
-ASMFLAGS = --create-dep $(@:.o=.d)
-CFLAGS = --create-dep $(@:.o=.d)
+ASMFLAGS = --create-dep $(@:.o=.d) --asm-include-dir src
+CFLAGS = --create-dep $(@:.o=.d) -I src
 LDFLAGS = -m $@.map -vm
 
 GIT_VERSION := .byte "$(shell git describe --always --dirty 2>/dev/null || echo unknown)"
@@ -27,97 +27,115 @@ CFLAGS += -g
 LDFLAGS += -Wl --dbgfile,$@.dbg
 endif
 
-all: $(addprefix basic_,$(TARGETS))
+all: $(addprefix build/basic_,$(TARGETS))
 
 # Goal: basic_sim6502
-basic_sim6502.o: basic_sim6502.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t sim6502 -c $(ASMFLAGS) -o $@ $<
+build/basic_sim6502.o: targets/sim6502/basic_sim6502.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t sim6502 -c $(ASMFLAGS) --asm-include-dir targets/sim6502 -o $@ $<
 
-basic_sim6502: basic_sim6502.o
-	cl65 -t sim6502 -C sim6502/sim6502.cfg $(LDFLAGS) -o $@ $<
+build/basic_sim6502: build/basic_sim6502.o
+	@mkdir -p $(@D)
+	cl65 -t sim6502 -C targets/sim6502/sim6502.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
 # Goal: basic_apple2
-basic_apple2.o: basic_apple2.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t apple2 -c $(ASMFLAGS) -o $@ $<
+build/basic_apple2.o: targets/apple2/basic_apple2.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t apple2 -c $(ASMFLAGS) --asm-include-dir targets/apple2 -o $@ $<
 
-basic_apple2: basic_apple2.o
-	cl65 -t apple2 -C apple2/apple2.cfg $(LDFLAGS) -o $@ $<
+build/basic_apple2: build/basic_apple2.o
+	@mkdir -p $(@D)
+	cl65 -t apple2 -C targets/apple2/apple2.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
 # Goal: basic_apple2_lc
-basic_apple2_lc.o: basic_apple2_lc.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t apple2 -c $(ASMFLAGS) -o $@ $<
+build/basic_apple2_lc.o: targets/apple2/basic_apple2_lc.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t apple2 -c $(ASMFLAGS) --asm-include-dir targets/apple2 -o $@ $<
 
-basic_apple2_lc: basic_apple2_lc.o
-	cl65 -t apple2 -C apple2/apple2_lc.cfg $(LDFLAGS) -o $@ $<
+build/basic_apple2_lc: build/basic_apple2_lc.o
+	@mkdir -p $(@D)
+	cl65 -t apple2 -C targets/apple2/apple2_lc.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
 # Goal: basic_atari
-basic_atari.o: basic_atari.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t atari -c $(ASMFLAGS) -o $@ $<
+build/basic_atari.o: targets/atari/basic_atari.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t atari -c $(ASMFLAGS) --asm-include-dir targets/atari -o $@ $<
 
-basic_atari: basic_atari.o
-	cl65 -t atari -C atari/atari.cfg $(LDFLAGS) -o $@ $<
+build/basic_atari: build/basic_atari.o
+	@mkdir -p $(@D)
+	cl65 -t atari -C targets/atari/atari.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
 # Goal: basic_ac6502
-basic_ac6502.o: basic_ac6502.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t none -c $(ASMFLAGS) -o $@ $<
+build/basic_ac6502.o: targets/ac6502/basic_ac6502.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t none -c $(ASMFLAGS) --asm-include-dir targets/ac6502 -o $@ $<
 
-basic_ac6502: basic_ac6502.o
-	cl65 -t none -C ac6502/ac6502.cfg $(LDFLAGS) -o $@ $<
+build/basic_ac6502: build/basic_ac6502.o
+	@mkdir -p $(@D)
+	cl65 -t none -C targets/ac6502/ac6502.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
 # Goal: basic_vc83_serial
-basic_vc83_serial.o: basic_vc83_serial.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t none -c $(ASMFLAGS) -o $@ $<
+build/basic_vc83_serial.o: targets/vc83_serial/basic_vc83_serial.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t none -c $(ASMFLAGS) --asm-include-dir targets/vc83_serial -o $@ $<
 
-basic_vc83_serial: basic_vc83_serial.o
-	cl65 -t none -C vc83_serial/vc83_serial.cfg $(LDFLAGS) -o $@ $<
+build/basic_vc83_serial: build/basic_vc83_serial.o
+	@mkdir -p $(@D)
+	cl65 -t none -C targets/vc83_serial/vc83_serial.cfg $(LDFLAGS) -o $@ $<
 	$(PRINT_SIZE)
 
-basic_vc83_serial.mem: basic_vc83_serial
+build/basic_vc83_serial.mem: build/basic_vc83_serial
+	@mkdir -p $(@D)
 	if command -v srec_cat >/dev/null; then srec_cat $< -Binary -offset 0x0400 -Output $@ -VMem 8; else echo "srec_cat not installed"; touch $@; fi 
 
 # Rule for version.inc
-version.inc: FORCE
+src/version.inc: FORCE
+	@mkdir -p $(@D)
 	@echo '$(GIT_VERSION)' | cmp -s - $@ || echo '$(GIT_VERSION)' > $@
 
 # Rules for building the constants files:
-constants.inc: constants.m4
+src/constants.inc: src/constants.m4
+	@mkdir -p $(@D)
 	m4 $< >$@
 
-constants.h: constants.m4
+src/constants.h: src/constants.m4
+	@mkdir -p $(@D)
 	m4 -D__C__ $< >$@
 
 # Rules for building the zero page files:
-zeropage.s: zeropage.m4
+src/zeropage.s: src/zeropage.m4
+	@mkdir -p $(@D)
 	m4 -DOUTPUT=s $< >$@
 
-zeropage.h: zeropage.m4
+src/zeropage.h: src/zeropage.m4
+	@mkdir -p $(@D)
 	m4 -DOUTPUT=h $< >$@
 
 # Unit tests
 test: $(addprefix run_,$(TESTS))
 
-run_%: tests/%
+run_%: build/tests/%
 	sim65 $<
 
-tests/%: tests/%.o basic_tests.o
-	cl65 -t $(TEST_TARGET) -C $(TEST_TARGET)/$(TEST_TARGET).cfg $(LDFLAGS) -o $@ $^
+build/tests/%: build/tests/%.o build/tests/basic_tests.o
+	@mkdir -p $(@D)
+	cl65 -t $(TEST_TARGET) -C targets/$(TEST_TARGET)/$(TEST_TARGET).cfg $(LDFLAGS) -o $@ $^
 
-tests/%.o: tests/%.c constants.h zeropage.h tests/test.h
-	cl65 -t $(TEST_TARGET) -C $(TEST_TARGET)/$(TEST_TARGET).cfg -c $(CFLAGS) -o $@ $<
+build/tests/%.o: tests/%.c src/constants.h src/zeropage.h tests/test.h
+	@mkdir -p $(@D)
+	cl65 -t $(TEST_TARGET) -C targets/$(TEST_TARGET)/$(TEST_TARGET).cfg -c $(CFLAGS) -o $@ $<
 
-basic_tests.o: basic_tests.s basic.s constants.inc zeropage.s version.inc
-	cl65 -t $(TEST_TARGET) -C $(TEST_TARGET)/$(TEST_TARGET).cfg -c $(ASMFLAGS) -o $@ $<
-
-clean::
-	rm -f $(addprefix tests/,$(TESTS))
+build/tests/basic_tests.o: tests/basic_tests.s src/basic.s src/constants.inc src/zeropage.s src/version.inc
+	@mkdir -p $(@D)
+	cl65 -t $(TEST_TARGET) -C targets/$(TEST_TARGET)/$(TEST_TARGET).cfg -c $(ASMFLAGS) --asm-include-dir targets/sim6502 --asm-include-dir tests -o $@ $<
 
 # Integration tests
-expect_test: basic_sim6502 $(addprefix run_expect_test_,$(EXPECT_TESTS))
+expect_test: build/basic_sim6502 $(addprefix run_expect_test_,$(EXPECT_TESTS))
 
 run_expect_test_%:
 	expect expect_tests/$*.exp
@@ -126,8 +144,9 @@ run_expect_test_%:
 .SECONDARY:
 
 clean::
-	rm -f $(addprefix basic_,$(TARGETS)) basic_tests.o constants.inc constants.h zeropage.s zeropage.h version.inc *.o *.d *.map *.dbg tests/*.o tests/*.d tests/*.map tests/*.dbg
+	rm -rf build/
+	rm -f src/constants.inc src/constants.h src/zeropage.s src/zeropage.h src/version.inc
 
--include $(addsuffix .d,$(addprefix basic_,$(TARGETS)))
--include $(addsuffix .d,$(addprefix tests/,$(TESTS)))
--include basic_tests.d
+-include $(addsuffix .d,$(addprefix build/basic_,$(TARGETS)))
+-include $(addsuffix .d,$(addprefix build/tests/,$(TESTS)))
+-include build/tests/basic_tests.d

basic_ac6502.s

@@ -7,7 +7,7 @@
 
 proc spawn_basic {} {
     global spawn_id
-    spawn sim65 basic_sim6502
+    spawn sim65 build/basic_sim6502
     fconfigure $spawn_id -translation { crlf lf }
     expect "VC83 BASIC*BYTES FREE\n"
     expect_before {