From: Daniel Silverstone Date: Sat, 3 Nov 2012 17:49:30 +0000 (+0000) Subject: Convert the last bits for libdom X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=dc1d99abcc35fd50673ed009d9247ef976beed4f;p=libsvgtiny.git Convert the last bits for libdom --- diff --git a/Makefile b/Makefile index cb393a7..ff41860 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,12 @@ endif # libdom ifneq ($(PKGCONFIG),) CFLAGS := $(CFLAGS) \ - $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom) - LDFLAGS := $(LDFLAGS) \ - $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom) + $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet) + LDFLAGS := $(LDFLAGS) -lm \ + $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet) else CFLAGS := $(CFLAGS) -I$(PREFIX)/include - LDFLAGS := $(CFLAGS) -ldom + LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm endif include $(NSBUILD)/Makefile.top diff --git a/test/svgtiny_test.c b/test/svgtiny_test.c index 2a2c862..1b507fd 100644 --- a/test/svgtiny_test.c +++ b/test/svgtiny_test.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "svgtiny.h" @@ -78,8 +79,8 @@ int main(int argc, char *argv[]) case svgtiny_OUT_OF_MEMORY: fprintf(stderr, "svgtiny_OUT_OF_MEMORY"); break; - case svgtiny_LIBXML_ERROR: - fprintf(stderr, "svgtiny_LIBXML_ERROR"); + case svgtiny_LIBDOM_ERROR: + fprintf(stderr, "svgtiny_LIBDOM_ERROR"); break; case svgtiny_NOT_SVG: fprintf(stderr, "svgtiny_NOT_SVG");