diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-03 15:36:11 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-03 15:36:11 +0000 |
| commit | eeb651eadb47228ad41c21b80d75afc17c2924f8 (patch) | |
| tree | 5424c774cf22149fb1d59394b35eab07d5389884 | |
| parent | 1864e4c3991d7109db096f7eb332e0442433ec37 (diff) | |
| download | libdom-eeb651eadb47228ad41c21b80d75afc17c2924f8.tar.gz libdom-eeb651eadb47228ad41c21b80d75afc17c2924f8.tar.bz2 | |
Use pkg-config for hubbub cflags/libraries
svn path=/trunk/dom/; revision=6681
| -rw-r--r-- | bindings/hubbub/Makefile | 4 | ||||
| -rw-r--r-- | test/Makefile | 4 |
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 \ |