summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2012-11-03 17:49:30 (GMT)
committer Daniel Silverstone <dsilvers@digital-scurf.org>2012-11-03 17:49:30 (GMT)
commitdc1d99abcc35fd50673ed009d9247ef976beed4f (patch)
treee2b5f1697a7f89401abb457a8d1b7df773564606
parent4f6c3034252830b3f4c0a03cbb03a661fdb1d8e8 (diff)
downloadlibsvgtiny-dsilvers/tolibdom.tar.gz
libsvgtiny-dsilvers/tolibdom.tar.bz2
Convert the last bits for libdomdsilvers/tolibdom
-rw-r--r--Makefile8
-rw-r--r--test/svgtiny_test.c5
2 files changed, 7 insertions, 6 deletions
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 <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <stdlib.h>
#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");