Makefile portability fixes

Allow our makefiles to build with non-GNU 'make' implementations.
Required some renaming of not-really-QuakeC source to .r to get it right.

doc/Makefile.am

@@ -16,11 +16,12 @@ EXTRA_DIST= qf.ico \
 	progs/vm-exec.c progs/vm-mem.fig \
 	qtv/qwtv.fig
 
-%.png: %.fig
+SUFFIXES=.eps .fig .png
+.fig.png:
 	@mkdir -p `dirname $@`
 	fig2dev -L png $< $@
 
-%.eps: %.fig
+.fig.eps:
 	@mkdir -p `dirname $@`
 	fig2dev -L ps $< $@
 

ruamoko/cl_menu/Makefile.am

@@ -13,7 +13,9 @@ GZ=.gz
 else
 GZ=
 endif
-STRIP=$(shell echo `echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`)
+# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
+# so we have to bite the bullet and pass this to the shell every time.
+STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 menu_data=menu.dat$(GZ) menu.sym$(GZ) menu.plist
 
@@ -27,7 +29,7 @@ pkgdata_DATA= $(data)
 EXTRA_DATA= $(menu_data)
 
 menu_src= \
-	client_menu.qc controls_o.qc options.qc options_util.qc servlist.qc \
+	client_menu.r controls_o.r options.r options_util.r servlist.r \
 	Frame.r menu.r HUD.r plistmenu.r ../lib/debug.r \
 	\
 	CrosshairCvar.r CrosshairView.r CvarColor.r CvarColorView.r \
@@ -35,13 +37,10 @@ menu_src= \
 	CvarToggle.r CvarToggleView.r \
 	MenuGroup.r MouseToggle.r ProxyView.r RunToggle.r SubMenu.r
 
-%.qfo: %.r
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.qfo: %.qc
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-menu_obj=$(addsuffix .qfo,$(basename $(menu_src)))
+SUFFIXES=.qfo .r
+.r.qfo:
+	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
+menu_obj=$(menu_src:.r=.qfo)
 
 menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
 	$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a

ruamoko/game/Makefile.am

@@ -15,7 +15,9 @@ GZ=.gz
 else
 GZ=
 endif
-STRIP=$(shell echo `echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`)
+# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
+# so we have to bite the bullet and pass this to the shell every time.
+STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 if BUILD_RUAMOKO
 data=game.dat$(GZ)
@@ -28,14 +30,11 @@ EXTRA_DATA= game.dat
 
 game_src= Axe.r GameEntity.r World.r tempent.r
 
-%.qfo: %.r
+SUFFIXES=.qfo .r
+.r.qfo:
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
 
-%.qfo: %.qc
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
-
-game_obj=$(addsuffix .qfo,$(basename $(game_src)))
-
+game_obj=$(game_src:.r=.qfo)
 game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a
 	$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
 	$(GZIP)

ruamoko/gui/Makefile.am

@@ -20,10 +20,8 @@ endif
 pkglib_LIBRARIES= $(libs)
 EXTRA_LIBRARIES= $(gui_libs)
 
-%.qfo: %.r
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.o: %.r
+SUFFIXES= .qfo .r .qc
+.r.o:
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 libgui_a_SOURCES= \

ruamoko/lib/Makefile.am

@@ -23,10 +23,10 @@ endif
 pkglib_LIBRARIES= $(libs)
 EXTRA_LIBRARIES= $(ruamoko_libs)
 
-%.qfo: %.r
+SUFFIXES= .o .r .qc
+.r.o:
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.o: %.r
+.qc.o:
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 libr_a_SOURCES=\

ruamoko/scheme/Makefile.am

@@ -13,7 +13,9 @@ GZ=.gz
 else
 GZ=
 endif
-STRIP=$(shell echo `echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`)
+# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
+# so we have to bite the bullet and pass this to the shell every time.
+STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 RANLIB=touch
 
@@ -39,15 +41,13 @@ EXTRA_DIST = \
 		SchemeObject.h SchemeString.h Scope.h Symbol.h Void.h builtins.h \
 		debug.h defs.h state.h \
 		\
-		main.qc defs.qc
+		main.r defs.r
 
-%.qfo: %.r
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-
-%.o: %.r
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-%.o: %.qc
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
+SUFFIXES=.qc .qfo .r
+.r.qfo:
+	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
+.r.o:
+	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
 
 libscheme_a_SOURCES=\
 	SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \
@@ -60,9 +60,9 @@ scheme_data=\
 	main.dat$(GZ)
 
 scheme_src=\
-	main.qc defs.qc
+	main.r defs.r
 
-scheme_obj=$(addsuffix .o,$(basename $(scheme_src)))
+scheme_obj=$(scheme_src:.qc=.o)
 
 main.dat$(GZ): $(scheme_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a libscheme.a
 	$(QFCC) $(QCFLAGS) -p $(STRIP) -o main.dat $(scheme_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a