From 02d7eef0adecf2b086bf8da410e9412f373087d6 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 26 Mar 2022 17:20:19 -0400 Subject: [PATCH] Added distclean rule to makefiles --- Makefile | 14 ++++++++++++-- tools/Makefile | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1070f994..1f4f0586 100755 --- a/Makefile +++ b/Makefile @@ -47,6 +47,7 @@ COLOR ?= 1 ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean_lib) ifneq ($(MAKECMDGOALS),clean_src) +ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),reset) ################ Check if a baserom exists ################ @@ -120,6 +121,7 @@ endif endif endif endif +endif ################################ @@ -338,7 +340,15 @@ ifneq ($(wildcard ./build/.*),) rm -r build else @echo "/build/ directory has already been deleted." -endif +endif + +distclean: + rm -rf build + rm -rf assets + rm -rf ucode + rm -rf dkr.ld + rm -rf tools/ido-static-recomp/{,.[!.],..?}* # Deletes all files, including hidden ones. + $(MAKE) -C tools distclean clean_lib: ifneq ($(wildcard $(BUILD_DIR)/lib/.*),) @@ -477,7 +487,7 @@ test: $(BUILD_DIR)/$(TARGET).z64 load: $(BUILD_DIR)/$(TARGET).z64 $(LOADER) $(LOADER_FLAGS) $< -.PHONY: all clean default diff test +.PHONY: all clean distclean default diff test # Remove built-in rules, to improve performance MAKEFLAGS += --no-builtin-rules diff --git a/tools/Makefile b/tools/Makefile index 276604f5..42d9935b 100755 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,6 +21,8 @@ all: $(PROGRAMS) $(CXX_PROGRAMS) clean: rm -Rf $(PROGRAMS) $(CXX_PROGRAMS) $(BUILD_DIR) +distclean: clean + n64crc: n64crc.c $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) @@ -42,5 +44,5 @@ $(BUILD_DIR)/%.o: %.cpp dkr_assets_tool: $(dkr_assets_tool_OBJ_FILES) $(CXX) $^ -o $@ --std=c++17 -lstdc++fs -lcrypto -lssl -lpthread $(LDFLAGS) -.PHONY: all clean default +.PHONY: all clean distclean default