From 24bd994b019100ad735d7f5e2eb0900671c2b77b Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 11 Jun 2018 00:23:44 -0400
Subject: [PATCH] gr-sim: tfv: fix Makefile

---
 gr-sim/tfv/Makefile | 56 +++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/gr-sim/tfv/Makefile b/gr-sim/tfv/Makefile
index 72674d1d..c8cb108e 100644
--- a/gr-sim/tfv/Makefile
+++ b/gr-sim/tfv/Makefile
@@ -7,42 +7,48 @@ SDL_INCLUDE= `sdl-config --cflags`
 GR_SIM = ../gr-sim.a
 
 PNG2RLE = ../../gr-utils/png2rle
-TFVDIR = ../../tfv
+ARTDIR = ../../tfv/art
+
 
 all:	tfv
 
 ###
 
+$(GR_SIM):	
+	cd .. && make
+
+###
+
 $(PNG2RLE):	
 	cd ../.. && cd gr-utils && make
 
 ####
 
 tfv_backgrounds.c:	$(PNG2RLE) \
-			$(TFVDIR)/title.png \
-			$(TFVDIR)/map.png \
-			$(TFVDIR)/landing.png \
-			$(TFVDIR)/harfco.png \
-			$(TFVDIR)/belair.png \
-			$(TFVDIR)/math_office.png \
-			$(TFVDIR)/video_hr.png \
-			$(TFVDIR)/collegep.png \
-			$(TFVDIR)/umcp.png \
-			$(TFVDIR)/dining.png \
-			$(TFVDIR)/metro.png \
-			$(TFVDIR)/talbot.png
-	$(PNG2RLE) c $(TFVDIR)/title.png title_rle > tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/map.png map_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/landing.png landing_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/harfco.png harfco_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/belair.png belair_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/math_office.png math_office_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/video_hr.png video_hr_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/collegep.png collegep_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/umcp.png umcp_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/dining.png dining_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/metro.png metro_rle >> tfv_backgrounds.c
-	$(PNG2RLE) c $(TFVDIR)/talbot.png talbot_rle >> tfv_backgrounds.c
+			$(ARTDIR)/title.png \
+			$(ARTDIR)/map.png \
+			$(ARTDIR)/landing.png \
+			$(ARTDIR)/harfco.png \
+			$(ARTDIR)/belair.png \
+			$(ARTDIR)/math_office.png \
+			$(ARTDIR)/video_hr.png \
+			$(ARTDIR)/collegep.png \
+			$(ARTDIR)/umcp.png \
+			$(ARTDIR)/dining.png \
+			$(ARTDIR)/metro.png \
+			$(ARTDIR)/talbot.png
+	$(PNG2RLE) c $(ARTDIR)/title.png title_rle > tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/map.png map_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/landing.png landing_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/harfco.png harfco_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/belair.png belair_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/math_office.png math_office_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/video_hr.png video_hr_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/collegep.png collegep_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/umcp.png umcp_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/dining.png dining_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/metro.png metro_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/talbot.png talbot_rle >> tfv_backgrounds.c