summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bindings/hubbub/Makefile4
-rw-r--r--test/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile
index dd430c8..d98565a 100644
--- a/bindings/hubbub/Makefile
+++ b/bindings/hubbub/Makefile
@@ -19,9 +19,7 @@
# test Execute any test cases
# Manipulate include paths
-# TODO: fix hubbub include path finding -- needs hubbub to use pkgconfig
-CFLAGS += -I$(CURDIR) \
- -I../../../hubbub/include
+CFLAGS += -I$(CURDIR) `$(PKGCONFIG) --cflags libhubbub`
# Release output
RELEASE = ${TOP}/${COMPONENT}-libhubbub.a
diff --git a/test/Makefile b/test/Makefile
index f5f7233..0fb57d9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,9 +21,7 @@
# Extend toolchain settings
CFLAGS += -I${TOP}/src/ -I${TOP}/bindings/xml/ -I${TOP}/bindings/hubbub/ \
-I$(CURDIR)
-# TODO: fix hubbub library usage -- needs hubbub to use pkgconfig
-LDFLAGS += `${PKGCONFIG} ${PKGCONFIGFLAGS} --libs libxml-2.0` \
- -L${TOP}/../hubbub/ -lhubbub
+LDFLAGS += `${PKGCONFIG} ${PKGCONFIGFLAGS} --libs libxml-2.0 libhubbub`
# Libraries we link against
LIBS = -L./lib -ldomtest-debug -ldom-libxml-debug \