From 9f082e5ffaaa951b38b3395bc57a6ee089ae959e Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@soulsphere.org>
Date: Sun, 1 Sep 2019 21:10:14 -0400
Subject: [PATCH] build: Remove wadinfo.txt.

We no longer build the freedoom.wad resource WAD so this is redundant.
(It was removed in bfb95753bdbf2ae343).
---
 Makefile | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a4f5f7d8..1d68d6ce 100644
--- a/Makefile
+++ b/Makefile
@@ -33,17 +33,6 @@ force:
 lumps/freedoom.lmp lumps/freedm.lmp: force
 	echo $(VERSION) > $@
 
-# update wadinfo.txt
-
-wadinfo.txt: buildcfg.txt subdirs lumps/freedoom.lmp
-	$(CPP) -P -DDOOM2 < $< > $@
-wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp
-	$(CPP) -P -DDOOM1 -DULTDOOM < $< > $@
-wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp
-	$(CPP) -P -DDOOM2 < $< > $@
-wadinfo_freedm.txt : buildcfg.txt subdirs lumps/freedoom.lmp lumps/freedm.lmp
-	$(CPP) -P -DFREEDM < $< > $@
-
 # deutex doesnt allow redirects for the filenames in the texture
 # entries, so we have to change the texture1 symlink to point
 # to whichever wad we are working on
@@ -51,6 +40,9 @@ wadinfo_freedm.txt : buildcfg.txt subdirs lumps/freedoom.lmp lumps/freedm.lmp
 #---------------------------------------------------------
 # freedm iwad
 
+wadinfo_freedm.txt : buildcfg.txt subdirs lumps/freedoom.lmp lumps/freedm.lmp
+	$(CPP) -P -DFREEDM < $< > $@
+
 $(FREEDM): wadinfo_freedm.txt subdirs
 	@mkdir -p $(WADS)
 	rm -f $@
@@ -59,6 +51,9 @@ $(FREEDM): wadinfo_freedm.txt subdirs
 #---------------------------------------------------------
 # phase 1 (udoom) iwad
 
+wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp
+	$(CPP) -P -DDOOM1 -DULTDOOM < $< > $@
+
 $(FREEDOOM1): wadinfo_phase1.txt subdirs
 	@mkdir -p $(WADS)
 	rm -f $@
@@ -67,6 +62,9 @@ $(FREEDOOM1): wadinfo_phase1.txt subdirs
 #---------------------------------------------------------
 # phase 2 (doom2) iwad
 
+wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp
+	$(CPP) -P -DDOOM2 < $< > $@
+
 $(FREEDOOM2): wadinfo_phase2.txt subdirs
 	@mkdir -p $(WADS)
 	rm -f $@
@@ -103,8 +101,9 @@ endif
 clean: wad-image-clean
 	rm -f	*.html deutex.log $(OBJS) \
 		./COPYING.txt ./CREDITS.txt \
-		./wadinfo.txt ./wadinfo_phase1.txt \
-		./wadinfo_phase2.txt ./wadinfo_freedm.txt \
+		./wadinfo_phase1.txt \
+		./wadinfo_phase2.txt \
+		./wadinfo_freedm.txt \
 		./lumps/freedoom.lmp \
 		./lumps/freedm.lmp
 	-rmdir $(WADS)