qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
Bill Currie 2020-03-26 16:53:53 +09:00
parent 45d23ce521
commit 91c5283af5
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruamoko/cl_menu/Makefile.am
View File

@ -32,8 +32,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
SUFFIXES=.o .r SUFFIXES=.o .r
.r.o: .r.o:
$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $< $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
menu_src= \ menu_src= \
client_menu.r controls_o.r options.r options_util.r servlist.r \ client_menu.r controls_o.r options.r options_util.r servlist.r \

4
ruamoko/game/Makefile.am
View File

@ -30,8 +30,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
SUFFIXES=.o .r SUFFIXES=.o .r
.r.o: .r.o:
$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $< $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
game_src= Axe.r GameEntity.r World.r tempent.r game_src= Axe.r GameEntity.r World.r tempent.r

4
ruamoko/gui/Makefile.am
View File

@ -26,7 +26,9 @@ RANLIB=touch
SUFFIXES= .o .r SUFFIXES= .o .r
.r.o: .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= r_depfiles_remade=

4
ruamoko/lib/Makefile.am
View File

@ -29,8 +29,8 @@ RANLIB=touch
SUFFIXES= .o .r SUFFIXES= .o .r
.r.o: .r.o:
$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $< $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
r_depfiles_remade= r_depfiles_remade=

4
ruamoko/qwaq/Makefile.am
View File

@ -20,8 +20,8 @@ QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
SUFFIXES=.o .r SUFFIXES=.o .r
.r.o: .r.o:
$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
qwaq_app_dat_src= \ qwaq_app_dat_src= \
qwaq-app.r \ qwaq-app.r \

4
ruamoko/scheme/Makefile.am
View File

@ -36,8 +36,8 @@ RANLIB=touch
SUFFIXES=.o .r SUFFIXES=.o .r
.r.o: .r.o:
$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $< $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
r_depfiles_remade= r_depfiles_remade=