From 399da01ae4eb5c5e3e9349bacc2063c946c3d4a1 Mon Sep 17 00:00:00 2001
From: Bo Yang <struggleyb.nku@gmail.com>
Date: Tue, 11 Aug 2009 11:17:23 +0000
Subject: Merge the branches/struggleyb/libdom-remain back to trunk.

svn path=/trunk/dom/; revision=9191
---
 test/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'test/Makefile')

diff --git a/test/Makefile b/test/Makefile
index 3d50686..2d20d02 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,17 @@
-testlib_files := lib/comparators.c;lib/list.c;lib/testassert.c
-testlib_files := $(testlib_files);lib/testobject.c;lib/utils.c
+testutils_files := testutils/comparators.c;testutils/list.c;testutils/domasserts.c
+testutils_files := $(testutils_files);testutils/utils.c;testutils/foreach.c;testutils/load.c
 
-TESTCFLAGS := $(TESTCFLAGS) -I$(CURDIR) -I$(CURDIR)/$(DIR)
+TESTCFLAGS := $(TESTCFLAGS) -I$(CURDIR) -I$(CURDIR)/testutils
 
-DIR_TEST_ITEMS := binding:binding.c;$(testlib_files) \
-		test-list:test-list.c;$(testlib_files)
+DIR_TEST_ITEMS := $(testutils_files)
 
 define add_xml_test
   ifeq ($$(WANT_TEST),yes)
-    $(DIR)xml/c/$1.c: $(DIR)xml/tests/$1.xml
+	$(DIR)xml/c/$1.c: $(DIR)xml/tests/$1.xml
 	$$(Q)$$(XSLTPROC) $$(XSLTPROCFLAGS) -o $$@ \
 		$(DIR)transform/test-to-c.xsl $$<
 
-    DIR_TEST_ITEMS := $$(DIR_TEST_ITEMS) $1:xml/c/$1.c;$$(testlib_files)
+	DIR_TEST_ITEMS := $$(DIR_TEST_ITEMS) $1:xml/c/$1.c;$$(testlib_files)
   endif
 
   DISTCLEAN_ITEMS := $$(DISTCLEAN_ITEMS) $(DIR)xml/c/$1.c
-- 
cgit v1.2.3