From 8b8f7200a9bdae9396180bebedce69298677e8a6 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@github.com>
Date: Mon, 11 Feb 2013 17:44:19 -0500
Subject: [PATCH] Clean up the makefile a bit

Simplifies/explains png import
---
 Makefile | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 275066772..bb1b14d90 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,24 @@ TEXTFILES =	text/sweethoney.tx \
 		text/phone/trainers1.tx \
 		main.tx
 
-VERTFILES =	gfx/pics/%.png \
+VERTGFX =	gfx/pics/%.png \
 		gfx/trainers/%.png
 
-HORIZFILES =	$(filter-out gfx/%.png, $(VERTFILES))
+HORIZGFX =	$(filter-out gfx/%.png, $(VERTGFX))
 
-IMGFILES =	${VERTFILES} ${HORIZFILES}
 
-LZFILES =	gfx/%.lz
+# uncomment this build target to enable png import:
+
+#all: lzs
+
+# the recompressed graphics may be larger than the originals,
+# so take care to reorganize accordingly
 
 all: pokecrystal.gbc
 
+clean:
+	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+
 
 pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES}
 	rgbasm -o pokecrystal.o pokecrystal.asm
@@ -31,23 +38,18 @@ pokecrystal.gbc: pokecrystal.o
 	cmp baserom.gbc $@
 
 
-pngs:
+@lzs: ${VERTGFX} ${HORIZGFX}
+
+@pngs:
 	cd extras; python gfx.py mass-decompress; python gfx.py dump-pngs
 
 
-front.png: tiles.png
-	python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp
-
-tiles.png:
-	python gfx.py png-to-2bpp $@
-
-.png: ${VERTFILES}
-	python gfx.py png-to-lz --vert $@
-
-.png: ${HORIZFILES}
-	python gfx.py png-to-lz $@
-
-
-clean:
-	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+@front.png: tiles.png
+	cd extras; python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp
+@tiles.png:
+	cd extras; python gfx.py png-to-2bpp $@
+@.png: ${VERTGFX}
+	cd extras; python gfx.py png-to-lz --vert $@
+@.png: ${HORIZGFX}
+	cd extras; python gfx.py png-to-lz $@