From 42da88597339feda94e4efb0f0dc79e008df5ac0 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 7 Sep 2008 16:41:49 +0000
Subject: Native RO buildsystem. Beware of the NOP.

svn path=/trunk/hubbub/; revision=5275
---
 test/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/Makefile b/test/Makefile
index a26df39..c74854d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -34,9 +34,9 @@ d              := $(DIR)
 # Extend toolchain settings
 # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/
 CFLAGS := $(CFLAGS) -I$(TOP)/src/ -I$(d) \
-		`$(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json` \
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json) \
 		-Wno-unused-parameter
-LDFLAGS := $(LDFLAGS) `$(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json`
+LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
 
 ifdef PROFILE
 	CFLAGS := $(CFLAGS) -pg -fno-omit-frame-pointer
@@ -78,8 +78,14 @@ $(2): $(1)
 endef
 
 # Build rules for each test binary -- they all depend on the debug library
+# Except when building on RISC OS, of course because then make utterly fails to
+# detect that the debug library exists.
 define compile_test
+ifeq ($(HOST),riscos)
+$(2): $(3)
+else
 $(2): $(3) $(TOP)/$(COMPONENT)-debug.a
+endif
 	@$$(ECHO) $$(ECHOFLAGS) "==> $(1)"
 	@$$(CC) -c -g $$(DEBUGCFLAGS) -o $$@.o $(1)
 	@$$(LD) -g -o $$@ $$@.o -lhubbub-debug $$(LDFLAGS) -lgcov
-- 
cgit v1.2.3