From 9ac9b8cefc392958f57c0d2aceb308e3f15dfbec Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 26 Jun 2020 19:49:22 -0400
Subject: Create fixrom to monkeypatch makerom Dep scanning for o2narc targets
 Remove post-failure script because it can't be made to work

---
 filesystem.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'filesystem.mk')

diff --git a/filesystem.mk b/filesystem.mk
index 05098980..9737436b 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -269,10 +269,10 @@ NITROFS_FILES := data/UTF16.dat \
                  dwc/utility.bin
 
 ifeq ($(GAME_VERSION),PEARL)
-NITROFS_FILES = $(NITROFS_FILES:poketool/personal/personal.narc=poketool/personal_pearl/personal.narc)
+NITROFS_FILES := $(NITROFS_FILES:poketool/personal/personal.narc=poketool/personal_pearl/personal.narc)
 endif
 
-HOSTFS_FILES = $(NITROFS_FILES:%=files/%)
+HOSTFS_FILES := $(NITROFS_FILES:%=files/%)
 
 %.narc:
 	$(KNARC) -d $(basename $@)/ -p $@
@@ -289,8 +289,14 @@ O2NARC_TARGETS := \
 
 files/poketool/personal/pms.narc: O2NARCFLAGS = -f
 
-$(O2NARC_TARGETS): %.narc: %.json %.json.txt
-	$(JSONPROC) $^ $*.c
+ifeq (,$(NODEP))
+$(O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@))
+else
+$(O2NARC_TARGETS): dep :=
+endif
+
+$(O2NARC_TARGETS): %.narc: %.json %.json.txt $$(dep)
+	$(JSONPROC) $*.json $*.json.txt $*.c
 	$(CC) $(CFLAGS) -c -o $*.o $*.c
 	$(O2NARC) $(O2NARCFLAGS) $*.o $@
 	@$(RM) $*.o $*.c
-- 
cgit v1.2.3