summarylogtreecommitdiffstats
path: root/wit-makefile.patch
diff options
context:
space:
mode:
authorFerdinand Bachmann2021-05-15 01:33:48 +0200
committerFerdinand Bachmann2021-05-15 01:34:43 +0200
commit838eb0a6147c2e63acdd024bf286bddbc182e4b8 (patch)
treebb2c1b51d288c3bfe2852b4951f4da6ca4ffcf7f /wit-makefile.patch
parentf72fcfd8dadc5aed6cd31d0c24126b79a82fe66b (diff)
downloadaur-838eb0a6147c2e63acdd024bf286bddbc182e4b8.tar.gz
simplify wit-makefile.patch so it doesn't break on every Makefile change
Diffstat (limited to 'wit-makefile.patch')
-rw-r--r--wit-makefile.patch131
1 files changed, 0 insertions, 131 deletions
diff --git a/wit-makefile.patch b/wit-makefile.patch
index f48c2bbc8c56..6d4ffc60122c 100644
--- a/wit-makefile.patch
+++ b/wit-makefile.patch
@@ -42,134 +42,3 @@ diff -rupN wiimms-iso-tools.orig/project/Makefile wiimms-iso-tools/project/Makef
DISTRIB_RM = ./wit-v$(VERSION)-r
DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT)
-@@ -380,83 +378,70 @@ default_rule: all
- # general rules
-
- $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
-- @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
-- @if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
-
-- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
-- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
-+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
-+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
- then cp -p $@ bin/$(SYSTEM)/debug/; \
- else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi
-
- #--------------------------
-
- $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
-- @printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
-
- #--------------------------
-
- $(WDF_LINKS): wdf
-- @printf "$(LOGFORMAT_INST)" "link" "wdf -> $@" ""
-- @ln -f wdf "$@"
-+ ln -f wdf "$@"
-
- #--------------------------
-
- $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
-- @printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
-- @printf "$(LOGFORMAT_CC)" object "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(ASM_OBJECTS): %.o: %.S Makefile
-- @printf "$(LOGFORMAT_CC)" asm "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@
-- @printf "$(LOGFORMAT)" create "$@" ""
-- @chmod 775 $(GEN_TEMPLATE)
-- @$(GEN_TEMPLATE) $@
-+ chmod 775 $(GEN_TEMPLATE)
-+ $(GEN_TEMPLATE) $@
-
- #--------------------------
-
- $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@
-- @printf "$(LOGFORMAT)" text "$@" ""
-- @chmod 775 $(GEN_TEXT_FILE)
-- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@
-+ chmod 775 $(GEN_TEXT_FILE)
-+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@
-
- #--------------------------
-
- $(UI_FILES): gen-ui.c ui.h $(UI_TABS) | gen-ui
-- @printf "$(LOGFORMAT)" run gen-ui ""
-- @./gen-ui
-+ ./gen-ui
-
- .PHONY : ui
- ui : gen-ui
-- @printf "$(LOGFORMAT)" run gen-ui ""
-- @./gen-ui
-+ ./gen-ui
-
- #
- ###############################################################################
- # lib specific rules
-
- $(LIBBZ2_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-
- $(LZMA_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/lzma/,,$@)" "$(MODE) [lzma]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-
- #
- ###############################################################################
-@@ -654,9 +633,8 @@ doc: $(MAIN_TOOLS) templates.sed gen-doc
-
- .PHONY : gen-doc
- gen-doc:
-- @printf "$(LOGFORMAT)" create documentation ""
-- @chmod ug+x $(GEN_TEMPLATE)
-- @$(GEN_TEMPLATE)
-+ chmod ug+x $(GEN_TEMPLATE)
-+ $(GEN_TEMPLATE)
-
- #
- #--------------------------
-@@ -840,13 +818,12 @@ templates.sed: Makefile
-
- .PHONY : test
- test:
-- @printf "$(LOGFORMAT)" enable test "-> define -DTEST"
-- @rm -f *.o $(ALL_TOOLS_X)
-- @echo "-DTEST" >>$(MODE_FILE)
-- @sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
-+ rm -f *.o $(ALL_TOOLS_X)
-+ echo "-DTEST" >>$(MODE_FILE)
-+ sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
- # 2 steps to bypass a cygwin mv failure
-- @cp $(MODE_FILE).tmp $(MODE_FILE)
-- @rm -f $(MODE_FILE).tmp
-+ cp $(MODE_FILE).tmp $(MODE_FILE)
-+ rm -f $(MODE_FILE).tmp
-
- #
- #--------------------------