Don't try to copy into firmware directory unless make dist was called

Author: FozzTexx

Makefile.adam

@@ -25,7 +25,14 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS))
 
 $(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS)
-	cp autorun.ddp ../fujinet-platformio/data/webui/device_specific/BUILD_ADAM/
+
+.PHONY: dist autorun clean
+
+dist: $(TARGET_EXEC)
+	cp $< ../fujinet-platformio/data/webui/device_specific/BUILD_ADAM/
+
+# Just here so all platforms can have a `make autorun`
+autorun: $(TARGET_EXEC)
 
 # c source
 $(BUILD_DIR)/%.c.o: %.c
@@ -37,8 +44,6 @@ $(BUILD_DIR)/%.asm.o: %.asm
 	$(MKDIR_P) $(dir $@)
 	$(AS) $(ASFLAGS) -c $< -o $@
 
-.PHONY: clean
-
 clean:
 	$(RM) -r autorun* $(BUILD_DIR)
 

Makefile.apple2

@@ -17,6 +17,7 @@ FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 # Name of the final, single-file executable.
 # Default: name of the current dir with target name appended
 PROGRAM := config
+DISK := dist.apple2/autorun.po
 
 # Path(s) to additional libraries required for linking the program
 # Use only if you don't want to place copies of the libraries in SRCDIR
@@ -256,7 +257,7 @@ ASFLAGS += --asm-include-dir src/$(TARGETLIST)/asminc --asm-include-dir $(FUJINE
 CFLAGS += --include-dir $(FUJINET_LIB_VERSION_DIR) -DUSING_FUJINET_LIB
 
 .SUFFIXES:
-.PHONY: all test clean get_fujinet_lib zap love
+.PHONY: all test clean get_fujinet_lib zap love dist autorun
 
 all: get_fujinet_lib $(PROGRAM)
 
@@ -344,24 +345,29 @@ test: $(PROGRAM)
 	$(EMUCMD) $<
 	$(POSTEMUCMD)
 
-dist: $(PROGRAM)
-	cp dist.apple2/bootable.po dist.apple2/dist.po
-	./dist.apple2/add-file.sh dist.apple2/dist.po config config.system
+$(DISK): $(PROGRAM)
+	cp dist.apple2/bootable.po $@
+	./dist.apple2/add-file.sh $@ config config.system
+
+dist: $(DISK)
 	@( \
-    echo "Attempting to copy autorun.po to firmware folder outside of project" ; \
+    echo "Attempting to copy $(DISK) to firmware folder outside of project" ; \
     if [ -d ../fujinet-firmware/ ] ; then \
       echo "Copying into ../fujinet-firmware" ; \
-      cp dist.apple2/dist.po ../fujinet-firmware/data/webui/device_specific/BUILD_APPLE/autorun.po ; \
+      cp dist.apple2/dist.po ../fujinet-firmware/data/webui/device_specific/BUILD_APPLE/$(DISK) ; \
     elif [ -d ../fujinet-platformio/ ] ; then \
       echo "Copying into ../fujinet-platformio (NOTE: please consider renaming to updated fujinet-firmware name)" ; \
-      cp dist.apple2/dist.po ../fujinet-platformio/data/webui/device_specific/BUILD_APPLE/autorun.po ; \
+      cp dist.apple2/dist.po ../fujinet-platformio/data/webui/device_specific/BUILD_APPLE/$(DISK) ; \
     else \
-      echo "ERROR: Could not find fujinet firmware folder to copy autorun.po to." ; \
+      echo "ERROR: Could not find fujinet firmware folder to copy $(DISK) to." ; \
       echo "Tried ../fujinet-firmware, and ../fujinet-platformio" ; \
       exit 1 ; \
     fi ; \
 	)
 
+# Just here so all platforms can have a `make autorun`
+autorun: $(DISK)
+
 gendebug: $(PROGRAM)
 	@echo "Generating debug.scr script for AppleWin"
 	@echo 'echo "Loading symbols"' > debug.scr

Makefile.coco

@@ -5,17 +5,26 @@ AS=lwasm
 CP=cp
 ECHO=echo
 FIRMWARE_DIR="../fujinet-firmware"
+TARGET_EXEC=config.bin
+DISK=autorun.dsk
 
-config.bin: check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
-	$(CC) -o config.bin check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
-	$(RM) autorun.dsk
-	decb dskini autorun.dsk
-	decb copy -t -0 dist.coco/autoexec.bas autorun.dsk,AUTOEXEC.BAS
-	writecocofile autorun.dsk config.bin
-	$(CP) autorun.dsk $(FIRMWARE_DIR)/data/webui/device_specific/BUILD_COCO/
-#	$(CP) autorun.dsk ~/tnfs/
+$(TARGET_EXEC): check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
+	$(CC) -o $@ check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
+
+$(DISK): $(TARGET_EXEC)
+	$(RM) $(DISK)
+	decb dskini $(DISK)
+	decb copy -t -0 dist.coco/autoexec.bas $(DISK),AUTOEXEC.BAS
+	writecocofile $(DISK) $<
+
+dist: $(DISK)
+	$(CP) $< $(FIRMWARE_DIR)/data/webui/device_specific/BUILD_COCO/
 	$(ECHO) Now, Do a Upload Filesystem task.
 
+.PHONY: autorun
+# Just here so all platforms can have a `make autorun`
+autorun: $(DISK)
+
 pause.o: src/coco/pause.c
 	$(CC) -c src/coco/pause.c
 
@@ -73,5 +82,5 @@ screen.o: src/coco/screen.c
 clean:
 	$(RM) *.o
 	$(RM) coco/*.o
-	$(RM) config.bin
-	$(RM) autorun.dsk
+	$(RM) $(TARGET_EXEC)
+	$(RM) $(DISK)