Fix Makefile.coco so executable is default and .o pattern depends on fujinet-lib

Author: FozzTexx

Makefile.coco

@@ -25,27 +25,8 @@ LIBS=-L $(FUJINET_LIB_VERSION_DIR) -l$(FUJINET_LIB_BASENAME)
 CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR)
 LIMITFLAGS=--org=0E00 --limit=7C00
 
-get_fujinet_lib:
-	@if [ ! -f "$(FUJINET_LIB_DOWNLOAD_FILE)" ]; then \
-		if [ -d "$(FUJINET_LIB_VERSION_DIR)" ]; then \
-		  echo "A directory already exists with version $(FUJINET_LIB_VERSION) - please remove it first"; \
-			exit 1; \
-		fi; \
-		HTTPSTATUS=$$(curl -Is $(FUJINET_LIB_DOWNLOAD_URL) | head -n 1 | awk '{print $$2}'); \
-		if [ "$${HTTPSTATUS}" == "404" ]; then \
-			echo "ERROR: Unable to find file $(FUJINET_LIB_DOWNLOAD_URL)"; \
-			exit 1; \
-		fi; \
-		echo "Downloading fujinet-lib for $(CURRENT_TARGET) version $(FUJINET_LIB_VERSION) from $(FUJINET_LIB_DOWNLOAD_URL)"; \
-		mkdir -p $(FUJINET_LIB); \
-		curl -L $(FUJINET_LIB_DOWNLOAD_URL) -o $(FUJINET_LIB_DOWNLOAD_FILE); \
-		echo "Unzipping to $(FUJINET_LIB)"; \
-		unzip -o $(FUJINET_LIB_DOWNLOAD_FILE) -d $(FUJINET_LIB_VERSION_DIR); \
-		echo "Unzip complete."; \
-		cd "$(FUJINET_LIB_VERSION_DIR)" && ln -sf "$(FUJINET_LIB_BASENAME)" "$(FUJINET_LIB_SYMLINK)" ; \
-	fi
-
-$(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 strendswith.o pause.o
+OBJS = 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 strendswith.o pause.o
+$(TARGET_EXEC): $(OBJS)
 	$(CC) $(LIMITFLAGS) -o $@ $^ $(LIBS)
 
 cfgload.bin:
@@ -65,12 +46,32 @@ dist: $(R2R_BIN) cfgload.bin
 .PHONY: r2r get_fujinet_lib
 
 # Create the "Ready 2 Run" executable/disk
-r2r: get_fujinet_lib $(R2R_BIN)
+r2r: $(R2R_BIN)
+
+get_fujinet_lib:
+	@if [ ! -f "$(FUJINET_LIB_DOWNLOAD_FILE)" ]; then \
+		if [ -d "$(FUJINET_LIB_VERSION_DIR)" ]; then \
+		  echo "A directory already exists with version $(FUJINET_LIB_VERSION) - please remove it first"; \
+			exit 1; \
+		fi; \
+		HTTPSTATUS=$$(curl -Is $(FUJINET_LIB_DOWNLOAD_URL) | head -n 1 | awk '{print $$2}'); \
+		if [ "$${HTTPSTATUS}" == "404" ]; then \
+			echo "ERROR: Unable to find file $(FUJINET_LIB_DOWNLOAD_URL)"; \
+			exit 1; \
+		fi; \
+		echo "Downloading fujinet-lib for $(CURRENT_TARGET) version $(FUJINET_LIB_VERSION) from $(FUJINET_LIB_DOWNLOAD_URL)"; \
+		mkdir -p $(FUJINET_LIB); \
+		curl -L $(FUJINET_LIB_DOWNLOAD_URL) -o $(FUJINET_LIB_DOWNLOAD_FILE); \
+		echo "Unzipping to $(FUJINET_LIB)"; \
+		unzip -o $(FUJINET_LIB_DOWNLOAD_FILE) -d $(FUJINET_LIB_VERSION_DIR); \
+		echo "Unzip complete."; \
+		cd "$(FUJINET_LIB_VERSION_DIR)" && ln -sf "$(FUJINET_LIB_BASENAME)" "$(FUJINET_LIB_SYMLINK)" ; \
+	fi
 
 $(R2R_DIR):
 	mkdir -p $@
 
-%.o: %.c
+%.o: %.c get_fujinet_lib
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 vpath %.c src src/coco