summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:31:15 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:31:15 +0000
commit93c202497fa12f75c393e686ed470f85faa72af2 (patch)
treedbf688f4f4bbd1ac162d5b1d03d6c5cdb62e5ee4 /test
parent0d98990eace7a5054dfbb927e16e67eadaf63653 (diff)
downloadlibhubbub-93c202497fa12f75c393e686ed470f85faa72af2.tar.gz
libhubbub-93c202497fa12f75c393e686ed470f85faa72af2.tar.bz2
Fix determination of whether json is required
svn path=/trunk/hubbub/; revision=6846
Diffstat (limited to 'test')
-rw-r--r--test/Makefile8
1 files changed, 0 insertions, 8 deletions
diff --git a/test/Makefile b/test/Makefile
index a592c56..693098b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,3 @@
-ifeq ($(MAKECMDGOALS),test)
-# Extend toolchain settings
-# We require the presence of libjson -- http://oss.metaparadigm.com/json-c/
-CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json) \
- -Wno-unused-parameter
-LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
-endif
-
# Tests
DIR_TEST_SOURCES := csdetect.c dict.c entities.c hubbub.c parser.c \
tokeniser.c tokeniser2.c tokeniser3.c tree.c tree2.c tree-buf.c