From 91c5283af5209d2873e62e4ad2a9eae41b873966 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:53:53 +0900
Subject: [PATCH] [build] Fix ruamoko/gui's auto dependencies

Changing str_free's return type highlighted that I'd missed an edit when
I did the big ruamoko build cleanup.

Also silence the sed/mv noise now that things are working nicely.
---
 ruamoko/cl_menu/Makefile.am | 4 ++--
 ruamoko/game/Makefile.am    | 4 ++--
 ruamoko/gui/Makefile.am     | 4 +++-
 ruamoko/lib/Makefile.am     | 4 ++--
 ruamoko/qwaq/Makefile.am    | 4 ++--
 ruamoko/scheme/Makefile.am  | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
index ceaef7fe5..2d2b0c4d0 100644
--- a/ruamoko/cl_menu/Makefile.am
+++ b/ruamoko/cl_menu/Makefile.am
@@ -32,8 +32,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 menu_src= \
 	client_menu.r controls_o.r options.r options_util.r servlist.r \
diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am
index 95093647f..e7cee8113 100644
--- a/ruamoko/game/Makefile.am
+++ b/ruamoko/game/Makefile.am
@@ -30,8 +30,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 game_src= Axe.r GameEntity.r World.r tempent.r
 
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index 35d2624df..7edb5f173 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -26,7 +26,9 @@ RANLIB=touch
 
 SUFFIXES= .o .r
 .r.o:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=
 
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 49107b28f..2f67f04fd 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -29,8 +29,8 @@ RANLIB=touch
 SUFFIXES= .o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=
 
diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 4f81c8424..b615f11ba 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -20,8 +20,8 @@ QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_app_dat_src= \
 	qwaq-app.r \
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index f62c36191..3d4319863 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -36,8 +36,8 @@ RANLIB=touch
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=