1 files changed, 13 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 37095e69..881aa3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -247,41 +247,25 @@ PADDED_LZ_FILES := $(addsuffix .lz,$(wildcard \
 $(PADDED_LZ_FILES): %.lz: %
 	$(NTRCOMP) -l2 -s -A4 -o $@ $<
 
-%.NCGR: %.png
-	$(GFX) $< $@
-
-$(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png
-	$(GFX) $< $@ -clobbersize
+$(CLOBBER_SIZE_NCGR_FILES): GFX_FLAGS = -clobbersize
+$(CLOBBER_SIZE_VERSION101_NCGR_FILES): GFX_FLAGS = -clobbersize -version101
+$(VERSION101_SOPC_8BPP_NCGR_FILES): GFX_FLAGS = -version101 -sopc -bitdepth 8
+$(VERSION101_SOPC_NCGR_FILES): GFX_FLAGS = -version101 -sopc
+$(SCANNED_NCGR_FILES): GFX_FLAGS = -scanned
 
-$(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
-	$(GFX) $< $@ -clobbersize -version101
+$(IR_NCLR_FILES): GFX_FLAGS = -ir
+$(4BPP_NCLR_FILES): GFX_FLAGS = -bitdepth 4
+$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10
+$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10
 
-$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png
-	$(GFX) $< $@ -version101 -sopc -bitdepth 8
-
-$(VERSION101_SOPC_NCGR_FILES): %.NCGR: %.png
-	$(GFX) $< $@ -version101 -sopc
-
-$(SCANNED_NCGR_FILES): %.NCGR: %.png
-	$(GFX) $< $@ -scanned
+%.NCGR: %.png
+	$(GFX) $< $@ $(GFX_FLAGS)
 
 %.NCLR: %.png
-	$(GFX) $< $@
+	$(GFX) $< $@ $(GFX_FLAGS)
 
 %.NCLR: %.pal
-	$(GFX) $< $@
-
-$(IR_NCLR_FILES): %.NCLR: %.pal
-	$(GFX) $< $@ -ir
-
-$(4BPP_NCLR_FILES): %.NCLR: %.pal
-	$(GFX) $< $@ -bitdepth 4
-
-$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): %.NCLR: %.png
-	$(GFX) $< $@ -bitdepth 8 -nopad -comp 10
-
-$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): %.NCLR: %.pal
-	$(GFX) $< $@ -bitdepth 8 -nopad -comp 10
+	$(GFX) $< $@ $(GFX_FLAGS)
 
 %.png: ;
 %.pal: ;