Get rid of FS_CLEAN_TARGETS

Works around issue where `make clean` yields `argument list too long`
2024-10-06 18:13:21 +00:00 · 2024-09-28 10:00:40 -04:00 · 2024-09-28 10:00:40 -04:00 · 336b263be6
commit 336b263be6
parent a1474bf95e
40 changed files with 205 additions and 56 deletions
--- a/files/application/annon/puzzle_gra.mk
+++ b/files/application/annon/puzzle_gra.mk
@ -34,12 +34,16 @@ VERSION101_SOPC_NCGR_FILES += \
 	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000000.NCLR \
 	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000010.NCLR

-FS_CLEAN_TARGETS += $(ALPH_PUZZLE_DIR).narc \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000001.NCGR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000004.NCGR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000005.NCGR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000006.NCGR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000007.NCGR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000000.NCLR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000010.NCLR \
-	$(ALPH_PUZZLE_DIR)/puzzle_gra_00000011.NCGR
+clean-puzzle-gra:
+	$(RM) $(ALPH_PUZZLE_DIR).narc \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000001.NCGR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000004.NCGR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000005.NCGR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000006.NCGR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000007.NCGR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000000.NCLR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000010.NCLR \
+		$(ALPH_PUZZLE_DIR)/puzzle_gra_00000011.NCGR
+
+.PHONY: clean-puzzle-gra
+clean-filesystem: clean-puzzle-gra
--- a/files/application/choose_starter/choose_starter.mk
+++ b/files/application/choose_starter/choose_starter.mk
@ -52,4 +52,8 @@ $(CHOOSE_STARTER_SUB_NARC): \
 	$(CHOOSE_STARTER_SUB_DIR)/choose_starter_sub_res_00000024.NCER \
 	$(CHOOSE_STARTER_SUB_DIR)/choose_starter_sub_res_00000025.NANR

-FS_CLEAN_TARGETS += $(CHOOSE_STARTER_MAIN_NARC) $(CHOOSE_STARTER_SUB_NARC)
+clean-choose-starter:
+	$(RM) $(CHOOSE_STARTER_MAIN_NARC) $(CHOOSE_STARTER_SUB_NARC)
+
+.PHONY: clean-choose-starter
+clean-filesystem: clean-choose-starter
--- a/files/application/guinness.mk
+++ b/files/application/guinness.mk
@ -16,6 +16,9 @@ GUINNESS_FILES := \
 $(GUINNESS_NARC): $(addprefix $(GUINNESS_DIR)/,$(GUINNESS_FILES))
 	$(KNARC) -p $@ -d $(GUINNESS_DIR) -i

-FS_CLEAN_TARGETS += \
-	$(GUINNESS_NARC) \
+clean-guinness:
+	$(RM) $(GUINNESS_NARC) \
 	$(addprefix $(GUINNESS_DIR)/,$(filter %.lz,$(GUINNESS_FILES)))
+
+.PHONY: clean-guinness
+clean-filesystem: clean-guinness
--- a/files/application/record/record.mk
+++ b/files/application/record/record.mk
@ -15,4 +15,8 @@ APPLICATION_RECORD_BIN  := $(wildcard $(APPLICATION_RECORD_DIR)/*.bin)
 $(APPLICATION_RECORD_NARC): $(APPLICATION_RECORD_BIN) $(APPLICATION_RECORD_NCLR)
 	$(KNARC) -p $@ -d $(APPLICATION_RECORD_DIR) -i

-FS_CLEAN_TARGETS += $(APPLICATION_RECORD_NARC)
+clean-record:
+	$(RM) $(APPLICATION_RECORD_NARC)
+
+.PHONY: clean-record
+clean-filesystem: clean-record
--- a/files/application/voltorb_flip.mk
+++ b/files/application/voltorb_flip.mk
@ -22,4 +22,8 @@ VOLTORB_FLIP_FILES := \
 $(VOLTORB_FLIP_DIR).narc: $(addprefix $(VOLTORB_FLIP_DIR)/,$(VOLTORB_FLIP_FILES))
 	$(KNARC) -p $@ -d $(VOLTORB_FLIP_DIR) -i

-FS_CLEAN_TARGETS += $(VOLTORB_FLIP_DIR).narc
+clean-voltorb-flip:
+	$(RM) $(VOLTORB_FLIP_DIR).narc
+
+.PHONY: clean-voltorb-flip
+clean-filesystem: clean-voltorb-flip
--- a/files/arc/headbutt.mk
+++ b/files/arc/headbutt.mk
@ -7,6 +7,9 @@ $(HEADBUTT_NARC): %.$(buildname).narc: %.json %.json.txt
 	$(O2NARC) $*.o $@ -n
 	@$(RM) -f $*.s $*.o

-FS_CLEAN_TARGETS += \
-	$(HEADBUTT_DIR).d \
+clean-headbutt:
+	$(RM) $(HEADBUTT_DIR).d \
 	$(foreach bn,$(SUPPORTED_ROMS),$(HEADBUTT_DIR).$(bn).na{rc,ix})
+
+.PHONY: clean-headbutt
+clean-filesystem: clean-headbutt
--- a/files/arc/ppark.mk
+++ b/files/arc/ppark.mk
@ -12,4 +12,8 @@ $(PPARK_NARC): %.narc: $(PPARK_JSON) $(PPARK_TEMPLATE)

 $(PPARK_JSON): | $(WORK_DIR)/include/global.h

-FS_CLEAN_TARGETS += $(PPARK_NARC) $(PPARK_NARC:%.narc=%.c) $(PPARK_NARC:%.narc=%.o)
+clean-ppark:
+	$(RM) $(PPARK_NARC) $(PPARK_NARC:%.narc=%.c) $(PPARK_NARC:%.narc=%.o)
+
+.PHONY: clean-ppark
+clean-filesystem: clean-ppark
--- a/files/battledata/script/effect_seq.mk
+++ b/files/battledata/script/effect_seq.mk
@ -27,4 +27,8 @@ endif

 $(EFFECT_SCRIPT_NARC): $(EFFECT_SCRIPT_BINS)

-FS_CLEAN_TARGETS += $(EFFECT_SCRIPT_NARC) $(EFFECT_SCRIPT_BINS) $(EFFECT_SCRIPT_OBJS) $(EFFECT_SCRIPT_DEPS)
+clean-effect-seq:
+	$(RM) $(EFFECT_SCRIPT_NARC) $(EFFECT_SCRIPT_BINS) $(EFFECT_SCRIPT_OBJS) $(EFFECT_SCRIPT_DEPS)
+
+.PHONY: clean-effect-seq
+clean-filesystem: clean-effect-seq
--- a/files/battledata/script/move_seq.mk
+++ b/files/battledata/script/move_seq.mk
@ -27,4 +27,8 @@ endif

 $(MOVE_SCRIPT_NARC): $(MOVE_SCRIPT_BINS)

-FS_CLEAN_TARGETS += $(MOVE_SCRIPT_NARC) $(MOVE_SCRIPT_BINS) $(MOVE_SCRIPT_OBJS) $(MOVE_SCRIPT_DEPS)
+clean-move-seq:
+	$(RM) $(MOVE_SCRIPT_NARC) $(MOVE_SCRIPT_BINS) $(MOVE_SCRIPT_OBJS) $(MOVE_SCRIPT_DEPS)
+
+.PHONY: clean-move-seq
+clean-filesystem: clean-move-seq
--- a/files/battledata/script/subscript.mk
+++ b/files/battledata/script/subscript.mk
@ -27,4 +27,8 @@ endif

 $(BTL_SUBSCRIPT_SCRIPT_NARC): $(BTL_SUBSCRIPT_SCRIPT_BINS)

-FS_CLEAN_TARGETS += $(BTL_SUBSCRIPT_SCRIPT_NARC) $(BTL_SUBSCRIPT_SCRIPT_BINS) $(BTL_SUBSCRIPT_SCRIPT_OBJS) $(BTL_SUBSCRIPT_SCRIPT_DEPS)
+clean-subscript:
+	$(RM) $(BTL_SUBSCRIPT_SCRIPT_NARC) $(BTL_SUBSCRIPT_SCRIPT_BINS) $(BTL_SUBSCRIPT_SCRIPT_OBJS) $(BTL_SUBSCRIPT_SCRIPT_DEPS)
+
+.PHONY: clean-subscript
+clean-filesystem: clean-subscript
--- a/files/data/gs_areawindow.mk
+++ b/files/data/gs_areawindow.mk
@ -5,5 +5,9 @@ GS_AREAWINDOW_NCGR := $(GS_AREAWINDOW_PNGS:%.png=%.NCGR)
 GS_AREAWINDOW_NCLR := $(GS_AREAWINDOW_PNGS:%.png=%.NCLR)
 $(GS_AREAWINDOW_NARC): $(GS_AREAWINDOW_NCGR) $(GS_AREAWINDOW_NCLR)

-FS_CLEAN_TARGETS += $(GS_AREAWINDOW_NCGR) $(GS_AREAWINDOW_NCLR) $(GS_AREAWINDOW_NARC)
+clean-gs-areawindow:
+	$(RM) $(GS_AREAWINDOW_NCGR) $(GS_AREAWINDOW_NCLR) $(GS_AREAWINDOW_NARC)
 VERSION101_SOPC_NCGR_FILES += $(GS_AREAWINDOW_NCGR)
+
+.PHONY: clean-gs-areawindow
+clean-filesystem: clean-gs-areawindow
--- a/files/data/mmodel/mmodel.mk
+++ b/files/data/mmodel/mmodel.mk
@ -5,4 +5,8 @@ MMODEL_NARC := $(MMODEL_ROOT).narc

 $(MMODEL_NARC): $(MMODEL_BINS)

-FS_CLEAN_TARGETS += $(MMODEL_NARC)
+clean-mmodel:
+	$(RM) $(MMODEL_NARC)
+
+.PHONY: clean-mmodel
+clean-filesystem: clean-mmodel
--- a/files/data/mushi/mushi.mk
+++ b/files/data/mushi/mushi.mk
@ -11,4 +11,9 @@ $(MUSHI_BIN): %.bin: %.csv %.txt
 	$(CSV2BIN) compile $< $@ $*.txt $(CSV2BINFLAGS)

 FS_RULE_OVERRIDES += $(MUSHI_BIN)
-FS_CLEAN_TARGETS += $(MUSHI_BIN)
+
+clean-mushi:
+	$(RM) $(MUSHI_BIN)
+
+.PHONY: clean-mushi
+clean-filesystem: clean-mushi
--- a/files/data/photo_data.mk
+++ b/files/data/photo_data.mk
@ -11,4 +11,8 @@ $(PHOTO_DATA_NARC): %.narc: $(PHOTO_DATA_JSON) $(PHOTO_DATA_TEMPLATE)
 $(PHOTO_DATA_NARC): MWCFLAGS += -include global.h
 $(PHOTO_DATA_JSON): | $(WORK_DIR)/include/global.h

-FS_CLEAN_TARGETS += $(PHOTO_DATA_NARC) $(PHOTO_DATA_NARC:%.narc=%.c) $(PHOTO_DATA_NARC:%.narc=%.o)
+clean-photo-data:
+	$(RM) $(PHOTO_DATA_NARC) $(PHOTO_DATA_NARC:%.narc=%.c) $(PHOTO_DATA_NARC:%.narc=%.o)
+
+.PHONY: clean-photo-data
+clean-filesystem: clean-photo-data
--- a/files/data/resdat.mk
+++ b/files/data/resdat.mk
@ -13,4 +13,8 @@ $(DATA_RESDAT_BIN): %.bin: %.json $(DATA_RESDAT_DIR).json.txt | $(WORK_DIR)/incl
 $(DATA_RESDAT_NARC): $(DATA_RESDAT_BIN)
 	$(KNARC) -d $(DATA_RESDAT_DIR) -p $@ -i

-FS_CLEAN_TARGETS += $(DATA_RESDAT_NARC) $(DATA_RESDAT_BIN)
+clean-resdat:
+	$(RM) $(DATA_RESDAT_NARC) $(DATA_RESDAT_BIN)
+
+.PHONY: clean-resdat
+clean-filesystem: clean-resdat
--- a/files/demo/intro/intro.mk
+++ b/files/demo/intro/intro.mk
@ -72,4 +72,8 @@ INTRO_DEMO_FILES := \
 $(INTRO_DEMO_NARC): $(addprefix $(INTRO_DEMO_DIR)/,$(INTRO_DEMO_FILES))
 	$(KNARC) -p $@ -d $(INTRO_DEMO_DIR) -i

-FS_CLEAN_TARGETS += $(INTRO_DEMO_NARC)
+clean-intro:
+	$(RM) $(INTRO_DEMO_NARC)
+
+.PHONY: clean-intro
+clean-filesystem: clean-intro
--- a/files/demo/legend.mk
+++ b/files/demo/legend.mk
@ -116,4 +116,8 @@ LEGEND_DEMO_FILES := \
 $(LEGEND_DEMO_NARC): $(addprefix $(LEGEND_DEMO_DIR)/,$(LEGEND_DEMO_FILES))
 	$(KNARC) -d $(LEGEND_DEMO_DIR) -p $@ -i

-FS_CLEAN_TARGETS += $(LEGEND_DEMO_NARC)
+clean-legend-demo:
+	$(RM) $(LEGEND_DEMO_NARC)
+
+.PHONY: clean-legend-demo
+clean-filesystem: clean-legend-demo
--- a/files/demo/opening/gs_opening.mk
+++ b/files/demo/opening/gs_opening.mk
@ -109,4 +109,9 @@ GSOPENING_FILES := \
 	files/demo/opening/gs_opening/gs_opening_00000105.NSBTA

 $(GSOPENING_NARC): $(GSOPENING_FILES)
-FS_CLEAN_TARGETS += $(GSOPENING_NARC) $(filter %.lz,$(GSOPENING_FILES))
+
+clean-gs-opening:
+	$(RM) $(GSOPENING_NARC) $(filter %.lz,$(GSOPENING_FILES))
+
+.PHONY: clean-gs-opening
+clean-filesystem: clean-gs-opening
--- a/files/demo/title/titledemo.mk
+++ b/files/demo/title/titledemo.mk
@ -63,7 +63,11 @@ TITLEDEMO_8BPP_NCGR := $(TITLEDEMO_8BPP_PNGS:%.png=%.NCGR)

 $(TITLEDEMO_NARC): $(addprefix $(TITLEDEMO_DIR)/,$(TITLEDEMO_DEPS))

-FS_CLEAN_TARGETS += $(TITLEDEMO_NARC) $(TITLEDEMO_4BPP_NCGR) $(TITLEDEMO_8BPP_NCGR)
+clean-titledemo:
+	$(RM) $(TITLEDEMO_NARC) $(TITLEDEMO_4BPP_NCGR) $(TITLEDEMO_8BPP_NCGR)
+
+.PHONY: clean-titledemo
+clean-filesystem: clean-titledemo

 VERSION101_SOPC_8BPP_NCGR_FILES += $(TITLEDEMO_8BPP_NCGR)
 VERSION101_SOPC_NCGR_FILES      += $(TITLEDEMO_4BPP_NCGR)
--- a/files/fielddata/encountdata/gs_enc_data.mk
+++ b/files/fielddata/encountdata/gs_enc_data.mk
@ -9,4 +9,8 @@ $(ENCDATA_NARCS): MANIFEST = files/fielddata/encountdata/enc_data.txt
 $(ENCDATA_NARCS): %.narc: %.csv $(MANIFEST) $$(csvdep)
 	$(CSV2BIN) compile $< $@ $(MANIFEST) $(CSV2BINFLAGS)

-FS_CLEAN_TARGETS += $(ENCDATA_NARCS)
+clean-gs-enc-data:
+	$(RM) $(ENCDATA_NARCS)
+
+.PHONY: clean-gs-enc-data
+clean-filesystem: clean-gs-enc-data
--- a/files/fielddata/eventdata/zone_event.mk
+++ b/files/fielddata/eventdata/zone_event.mk
@ -13,7 +13,11 @@ $(ZONE_EVENT_TEMPL):

 $(ZONE_EVENT_JSON): $(ZONE_EVENT_TEMPL)

-FS_CLEAN_TARGETS += $(ZONE_EVENT_NARC) $(ZONE_EVENT_BIN) $(ZONE_EVENT_DEPS)
+clean-zone-event:
+	$(RM) $(ZONE_EVENT_NARC) $(ZONE_EVENT_BIN) $(ZONE_EVENT_DEPS)
+
+.PHONY: clean-zone-event
+clean-filesystem: clean-zone-event

 $(ZONE_EVENT_BIN): MWASFLAGS += -DPM_ASM
 $(ZONE_EVENT_BIN): %.bin: %.json
--- a/files/fielddata/graphic/preview_graphic/preview_graphic.mk
+++ b/files/fielddata/graphic/preview_graphic/preview_graphic.mk
@ -15,9 +15,12 @@ VERSION101_SOPC_8BPP_NCGR_FILES += $(PREVIEW_GRAPHIC_NCGR)
 $(PREVIEW_GRAPHIC_NARC): $(PREVIEW_GRAPHIC_NCGR_LZ) $(PREVIEW_GRAPHIC_NSCR_LZ) $(PREVIEW_GRAPHIC_NCLR)
 	$(KNARC) -p $(PREVIEW_GRAPHIC_NARC) -d $(PREVIEW_GRAPHIC_DIR) -i

-FS_CLEAN_TARGETS += \
-	$(PREVIEW_GRAPHIC_NCGR_LZ) \
+clean-preview-graphic:
+	$(RM) $(PREVIEW_GRAPHIC_NCGR_LZ) \
 	$(PREVIEW_GRAPHIC_NSCR_LZ) \
 	$(PREVIEW_GRAPHIC_NCGR) \
 	$(PREVIEW_GRAPHIC_NCLR) \
 	$(PREVIEW_GRAPHIC_NARC)
+
+.PHONY: clean-preview-graphic
+clean-filesystem: clean-preview-graphic
--- a/files/fielddata/mapmatrix/map_matrix.mk
+++ b/files/fielddata/mapmatrix/map_matrix.mk
@ -1,3 +1,7 @@
 FIELDDATA_MAPMATRIX_MAP_MATRIX_DIR := files/fielddata/mapmatrix/map_matrix

-FS_CLEAN_TARGETS += $(FIELDDATA_MAPMATRIX_MAP_MATRIX_DIR).narc
+clean-map-matrix:
+	$(RM) $(FIELDDATA_MAPMATRIX_MAP_MATRIX_DIR).narc
+
+.PHONY: clean-map-matrix
+clean-filesystem: clean-map-matrix
--- a/files/fielddata/script/scr_seq.mk
+++ b/files/fielddata/script/scr_seq.mk
@ -34,5 +34,8 @@ ifeq ($(COMPARE),1)
 	@$(SHA1SUM) --quiet -c $(PROJECT_ROOT)/scr_seq.sha1
 endif

-# Once this has been reversed, uncomment the below
-FS_CLEAN_TARGETS += $(SCRIPT_NARC) $(SCRIPT_BINS) $(SCRIPT_OBJS) $(SCRIPT_DEPS)
+clean-scr-seq:
+	$(RM) $(SCRIPT_NARC) $(SCRIPT_BINS) $(SCRIPT_OBJS) $(SCRIPT_DEPS)
+
+.PHONY: clean-scr-seq
+clean-filesystem: clean-scr-seq
--- a/files/fielddata/tsurepoke/tp_param.mk
+++ b/files/fielddata/tsurepoke/tp_param.mk
@ -6,4 +6,8 @@ TP_PARAM_SPEC := $(TP_PARAM_CSV).txt
 $(TP_PARAM_NARC): $(TP_PARAM_CSV) $(TP_PARAM_SPEC) include/constants/follow_mon_idx.h
 	$(CSV2BIN) $(CSV2BINFLAGS) compile $< $@ $<.txt

-FS_CLEAN_TARGETS += $(TP_PARAM_NARC)
+clean-tp-param:
+	$(RM) $(TP_PARAM_NARC)
+
+.PHONY: clean-tp-param
+clean-filesystem: clean-tp-param
--- a/files/fielddata/wazaoshie/waza_oshie.mk
+++ b/files/fielddata/wazaoshie/waza_oshie.mk
@ -10,5 +10,9 @@ $(WAZA_OSHIE_BIN): %.bin: %.json %.json.txt
 	$(WINE) $(MWAS) -DPM_ASM $(MWASFLAGS) -o $*.o $*.s
 	$(OBJCOPY) -O binary $*.o $@

-FS_CLEAN_TARGETS += $(WAZA_OSHIE_BIN) $(WAZA_OSHIE_S) $(WAZA_OSHIE_O)
+clean-waza-oshie:
+	$(RM) $(WAZA_OSHIE_BIN) $(WAZA_OSHIE_S) $(WAZA_OSHIE_O)
 FS_RULE_OVERRIDES += $(WAZA_OSHIE_BIN)
+
+.PHONY: clean-waza-oshie
+clean-filesystem: clean-waza-oshie
--- a/files/graphic/camera_viewfinder.mk
+++ b/files/graphic/camera_viewfinder.mk
@ -11,7 +11,10 @@ VERSION101_SOPC_NCGR_FILES += $(CAMERA_VIEWFINDER_DIR)/camera_viewfinder.NCGR
 $(CAMERA_VIEWFINDER_NARC): %.narc: $(CAMERA_VIEWFINDER_SRCS_ABS)
 	$(KNARC) -p $@ -d $* -i

-FS_CLEAN_TARGETS += \
-	$(CAMERA_VIEWFINDER_NARC) \
+clean-camera-viewfinder:
+	$(RM) $(CAMERA_VIEWFINDER_NARC) \
 	$(CAMERA_VIEWFINDER_SRCS_ABS) \
 	$(CAMERA_VIEWFINDER_DIR)/camera_viewfinder.NCGR
+
+.PHONY: clean-camera-viewfinder
+clean-filesystem: clean-camera-viewfinder
--- a/files/graphic/font.mk
+++ b/files/graphic/font.mk
@ -1,5 +1,5 @@
-FS_CLEAN_TARGETS += \
-	files/graphic/font/font_00000000.bin.lz \
+clean-font:
+	$(RM) files/graphic/font/font_00000000.bin.lz \
 	files/graphic/font/font_00000001.bin.lz \
 	files/graphic/font/font_00000002.bin.lz \
 	files/graphic/font/font_00000003.bin.lz \
@ -7,3 +7,6 @@ FS_CLEAN_TARGETS += \
 	files/graphic/font/font_00000005.NCGR.lz \
 	files/graphic/font/font_00000005.bin.lz \
 	files/graphic/font/font_00000010.bin.lz
+
+.PHONY: clean-font
+clean-filesystem: clean-font
--- a/files/graphic/plist_gra.mk
+++ b/files/graphic/plist_gra.mk
@ -32,4 +32,8 @@ PLIST_GRA_FILES := \

 $(PLIST_GRA_NARC): $(addprefix $(PLIST_GRA_DIR)/,$(PLIST_GRAPFILES))

-FS_CLEAN_TARGETS += $(PLIST_GRA_NARC)
+clean-plist-gra:
+	$(RM) $(PLIST_GRA_NARC)
+
+.PHONY: clean-plist-gra
+clean-filesystem: clean-plist-gra
--- a/files/itemtool/itemdata/item_data.mk
+++ b/files/itemtool/itemdata/item_data.mk
@ -9,4 +9,8 @@ $(ITEMDATA_NARC): %.narc: %.csv $(MANIFEST) $$(csvdep)

 $(ITEMICON_NARC): $(wildcard files/itemtool/itemdata/item_icon/*.{NANR,NCLR,NCGR,NCER})

-FS_CLEAN_TARGETS += $(ITEMDATA_NARC) $(ITEMICON_NARC)
+clean-itemdata:
+	$(RM) $(ITEMDATA_NARC) $(ITEMICON_NARC)
+
+.PHONY: clean-itemdata
+clean-filesystem: clean-itemdata
--- a/files/msgdata/msg.mk
+++ b/files/msgdata/msg.mk
@ -38,7 +38,11 @@ $(MSGFILE_H): %.h: %.bin
 $(FIRST_MSG_H_GEN): $(MSGFILE_H)
 	$(TOUCH_ONCE) $(FIRST_MSG_H_GEN)

-FS_CLEAN_TARGETS += $(MSGDATA_MSG_DIR).narc $(MSGFILE_BIN) $(MSGFILE_H) $(FIRST_MSG_H_GEN) $(TRNAME_GMM)
+clean-msg:
+	$(RM) $(MSGDATA_MSG_DIR).narc $(MSGFILE_BIN) $(MSGFILE_H) $(FIRST_MSG_H_GEN) $(TRNAME_GMM)
+
+.PHONY: clean-msg
+clean-filesystem: clean-msg

 files/msgdata/msg/msg_0000.bin: MSGENCFLAGS += -k 0xFEE8
 files/msgdata/msg/msg_0001.bin: MSGENCFLAGS += -k 0x9140
--- a/files/poketool/icongra/poke_icon/poke_icon.mk
+++ b/files/poketool/icongra/poke_icon/poke_icon.mk
@ -28,5 +28,8 @@ $(POKE_ICON_DIR)/%.NCGR: $(POKE_ICON_DIR)/%.png
 $(POKE_ICON_NARC): %.narc: $(POKE_ICON_PAL_OBJS) $(POKE_ICON_ANIM_OBJS) $(POKE_ICON_CELL_OBJS) $(POKE_ICON_ICON_OBJS)
 	$(KNARC) -d $(POKE_ICON_DIR) -p $@ -i

-FS_CLEAN_TARGETS += $(POKE_ICON_NARC) $(POKE_ICON_PAL_OBJS) $(POKE_ICON_ANIM_OBJS) $(POKE_ICON_CELL_OBJS) $(POKE_ICON_ICON_OBJS)
+clean-poke-icon:
+	$(RM) $(POKE_ICON_NARC) $(POKE_ICON_PAL_OBJS) $(POKE_ICON_ANIM_OBJS) $(POKE_ICON_CELL_OBJS) $(POKE_ICON_ICON_OBJS)

+.PHONY: clean-poke-icon
+clean-filesystem: clean-poke-icon
--- a/files/poketool/personal/evo.mk
+++ b/files/poketool/personal/evo.mk
@ -11,4 +11,8 @@ $(EVO_NARC): %.narc: $(EVO_JSON) $(EVO_TEMPLATE)
 $(EVO_NARC): MWCFLAGS += -include global.h
 $(EVO_JSON): | $(WORK_DIR)/include/global.h

-FS_CLEAN_TARGETS += $(EVO_NARC) $(EVO_NARC:%.narc=%.c) $(EVO_NARC:%.narc=%.o)
+clean-evo:
+	$(RM) $(EVO_NARC) $(EVO_NARC:%.narc=%.c) $(EVO_NARC:%.narc=%.o)
+
+.PHONY: clean-evo
+clean-filesystem: clean-evo
--- a/files/poketool/personal/growtbl.mk
+++ b/files/poketool/personal/growtbl.mk
@ -5,4 +5,8 @@ $(GROWTBL_NARC): MANIFEST = $(patsubst %.narc,%.txt,$@)\
 $(GROWTBL_NARC): %.narc: %.csv $(MANIFEST) $$(csvdep)
 	$(CSV2BIN) compile $< $@ $(MANIFEST) $(CSV2BINFLAGS)

-FS_CLEAN_TARGETS += $(GROWTBL_NARC)
+clean-growtbl:
+	$(RM) $(GROWTBL_NARC)
+
+.PHONY: clean-growtbl
+clean-filesystem: clean-growtbl
--- a/files/poketool/personal/personal.mk
+++ b/files/poketool/personal/personal.mk
@ -9,4 +9,8 @@ $(PERSONAL_NARC): %.narc: %.json %.json.txt | include/global.h
 	$(O2NARC) -n $*.o $@ -p 0
 	@$(RM) $*.o $*.c

-FS_CLEAN_TARGETS += $(PERSONAL_NARC)
+clean-personal:
+	$(RM) $(PERSONAL_NARC)
+
+.PHONY: clean-personal
+clean-filesystem: clean-personal
--- a/files/poketool/pokegra/otherpoke.mk
+++ b/files/poketool/pokegra/otherpoke.mk
@ -12,4 +12,8 @@ $(OTHERPOKE_NARC): %.narc: $(OTHERPOKE_PIC_FILES)
 	while read -r line; do $(GFX) $$line; done < $(OTHERPOKE_MAP_TXT)
 	$(KNARC) -d $(OTHERPOKE_BUILD_DIR) -p $@ -i

-FS_CLEAN_TARGETS += $(OTHERPOKE_NARC) $(OTHERPOKE_BUILD_DIR)
+clean-otherpoke:
+	$(RM) -r $(OTHERPOKE_NARC) $(OTHERPOKE_BUILD_DIR)
+
+.PHONY: clean-otherpoke
+clean-filesystem: clean-otherpoke
--- a/files/poketool/pokegra/pokegra.mk
+++ b/files/poketool/pokegra/pokegra.mk
@ -61,4 +61,8 @@ $(POKEGRA_NARC): %.narc: $(POKEGRA_FEMALE_BACK_OBJS) $(POKEGRA_MALE_BACK_OBJS) $
 	cp $(POKEGRA_SPRITES_DIR)/0000/4_0005.NCLR $(POKEGRA_BUILD_DIR)/0000-05.NCLR
 	$(KNARC) -d $(POKEGRA_BUILD_DIR) -p $@ -i

-FS_CLEAN_TARGETS += $(POKEGRA_NARC) $(POKEGRA_BUILD_DIR)
+clean-pokegra:
+	$(RM) -r $(POKEGRA_NARC) $(POKEGRA_BUILD_DIR)
+
+.PHONY: clean-pokegra
+clean-filesystem: clean-pokegra
--- a/files/poketool/trainer/trainer.mk
+++ b/files/poketool/trainer/trainer.mk
@ -19,6 +19,10 @@ $(TRPOKE_NARC): %.narc: $(TRAINER_JSON) $(TRPOKE_TEMPLATE)
 $(TRDATA_NARC): MWCFLAGS += -include global.h
 $(TRAINER_JSON): | $(WORK_DIR)/include/global.h

-FS_CLEAN_TARGETS += $(TRDATA_NARC) $(TRPOKE_NARC) \
+clean-trainer:
+	$(RM) $(TRDATA_NARC) $(TRPOKE_NARC) \
 	$(TRDATA_NARC:%.narc=%.o) $(TRPOKE_NARC:%.narc=%.o) \
 	$(TRDATA_NARC:%.narc=%.c) $(TRPOKE_NARC:%.narc=%.s)
+
+.PHONY: clean-trainer
+clean-filesystem: clean-trainer
--- a/files/resource/eng/pms_aikotoba/pms_aikotoba.mk
+++ b/files/resource/eng/pms_aikotoba/pms_aikotoba.mk
@ -3,11 +3,15 @@ PMS_AIKOTOBA_S    := $(PMS_AIKOTOBA_STEM).s
 PMS_AIKOTOBA_O    := $(PMS_AIKOTOBA_STEM).o
 PMS_AIKOTOBA_NARC := $(PMS_AIKOTOBA_STEM).narc

-FS_CLEAN_TARGETS += $(PMS_AIKOTOBA_NARC) $(PMS_AIKOTOBA_O)
+PMS_AIKOTOBA_DEP  := $(PMS_AIKOTOBA_S:%.s=%.d)

+clean-pms-aikotoba:
+	$(RM) $(PMS_AIKOTOBA_NARC) $(PMS_AIKOTOBA_O) $(PMS_AIKOTOBA_DEP)
+
+.PHONY: clean-pms-aikotoba
+clean-filesystem: clean-pms-aikotoba

 ifeq ($(NODEP),)
-PMS_AIKOTOBA_DEP  := $(PMS_AIKOTOBA_S:%.s=%.d)
 $(PMS_AIKOTOBA_NARC): %.narc: %.s
 $(PMS_AIKOTOBA_NARC): %.narc: %.s %.d
 	@echo gen  $@
@ -22,7 +26,6 @@ $(PMS_AIKOTOBA_NARC): %.narc: %.s %.d
 $(PMS_AIKOTOBA_DEP):

 include $(wildcard $(PMS_AIKOTOBA_DEP))
-FS_CLEAN_TARGETS += $(PMS_AIKOTOBA_DEP)
 else
 $(PMS_AIKOTOBA_NARC): %.narc: %.s
 	@echo gen  $@
--- a/filesystem.mk
+++ b/filesystem.mk
@ -544,4 +544,3 @@ clean-fs: clean-filesystem
 clean-filesystem:
 	$(RM) files/msgdata/msg/*.bin
 	$(RM) $(DIFF_ARCS) $(NAIXS)
-	$(RM) -r $(FS_CLEAN_TARGETS)