From ab127d265d02d9dca33d9bb9a4b04169c455ceec Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Sun, 7 Jan 2024 21:41:27 +0100
Subject: [PATCH] Makefile: remove unrequired zconh.h target

---
 Makefile                 | 8 --------
 SporeModManager/Makefile | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index ea15a2b..7f0f9dd 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,6 @@ clean:
 check:
 	$(MAKE) -C SporeModManager check BINARY_DIR=$(BINARY_DIR)/SporeModLoader/SporeModManager
 
-# this is needed due to compiling SporeModLoader twice,
-# which, when compiling with multiple threads, will cause
-# zconf.h to be generated twice, causing a build failure
-# due to a race condition (cp will fail due to the file
-# already existing, even with -f)
-$(THIRDPARTY_DIR)/zlib/zconf.h: $(THIRDPARTY_DIR)/zlib/zconf.h.in
-	$(MAKE) -C SporeModManager ../$@
-
 SporeModLoader:
 	$(MAKE) -C $@ BINARY_DIR=$(BINARY_DIR)/SporebinEP1
 
diff --git a/SporeModManager/Makefile b/SporeModManager/Makefile
index f3517a4..7dcc184 100644
--- a/SporeModManager/Makefile
+++ b/SporeModManager/Makefile
@@ -102,10 +102,6 @@ endif
 
 all: $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT)
 
-$(THIRDPARTY_DIR)/zlib/zconf.h: $(THIRDPARTY_DIR)/zlib/zconf.h.in
-	@echo "GEN $@"
-	$(QUIET)cp -f $@.in $@
-
 $(BINARY_DIR)/$(EXE_FILE): $(THIRDPARTY_OBJECT_FILES) $(OBJECT_FILES)
 	@echo "LD  $@"
 	$(QUIET)mkdir -p $(BINARY_DIR)
@@ -117,7 +113,7 @@ $(BINARY_DIR)/$(EXE_FILE).exe: $(THIRDPARTY_OBJECT_FILES) $(OBJECT_FILES)
 	$(QUIET)$(MINGW_CXX) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES) -o $@ $(LDFLAGS)
 
 clean:
-	rm -f $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES) $(THIRDPARTY_HEADER_FILES)
+	rm -f $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES)
 
 check: $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT)
 	python3 $(SOURCE_DIR)/test.py $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(TEST_ARGS)