From 5e52163458ff4b56d80c7143d74291b2bfab7cef Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sat, 21 Jul 2007 18:55:40 +0000
Subject: Silence GCC/LD command lines when building test cases. Improve
 structure of xml-based testsuite

svn path=/trunk/dom/; revision=3452
---
 test/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'test/Makefile')

diff --git a/test/Makefile b/test/Makefile
index f2cc1d3..82593de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -29,13 +29,13 @@ RELEASE =
 DEBUG =
 
 # Transformer input
-XMLFILES = $(wildcard xml/*.xml)
+XMLFILES = $(wildcard xml/tests/*.xml)
 
 # Transformer output
-CFILES = $(XMLFILES:.xml=.c)
+CFILES = $(addprefix xml/c/, $(notdir $(XMLFILES:.xml=.c)))
 
 # Objects
-OBJS = $(CFILES:.c=)
+OBJS = $(addprefix xml/bin/, $(notdir $(XMLFILES:.xml=)))
 
 .PHONY: clean debug export release setup test
 
@@ -46,15 +46,16 @@ debug:
 
 clean:
 ifneq (${OBJS}, )
-	-@${RM} ${RMFLAGS} $(CFILES)
-	-@${RM} ${RMFLAGS} $(CFILES:.c=.o)
-	-@${RM} ${RMFLAGS} $(addsuffix ${EXEEXT},  $(OBJS))
+	-@${RM} ${RMFLAGS} -r xml/c/
+	-@${RM} ${RMFLAGS} -r xml/bin/
 endif
 
 distclean:
 	-@${RM} ${RMFLAGS} log
 
 setup:
+	@${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/c
+	@${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/bin
 
 export:
 
@@ -64,11 +65,11 @@ test: $(OBJS)
 transform: $(CFILES)
 
 # Pattern rules
-%: %.c
+xml/bin/%: xml/c/%.c
 	@${ECHO} ${ECHOFLAGS} "==> $<"
-	${CC} -c -g ${CFLAGS} -o $@.o $<
-	${LD} -g -o $@ $@.o ${LDFLAGS} -ldom-libxml-debug -ldom-debug
+	@${CC} -c -g ${CFLAGS} -o $@.o $<
+	@${LD} -g -o $@ $@.o ${LDFLAGS} -ldom-libxml-debug -ldom-debug
 	@${RM} ${RMFLAGS} $@.o
 
-%.c: %.xml
+xml/c/%.c: xml/tests/%.xml
 	@${XSLT} ${XSLTFLAGS} -o $@ transform/test-to-c.xsl $<
-- 
cgit v1.2.3