X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=135ff74a7163d8d7bc9fb57346886481d9041681;hb=a5bf4ea6e6f6f3f9623cb63963e591f030396fa7;hp=308e7d0558333576c394e420e5aaa3d755373432;hpb=35db3a3d047cd55b2104294fbe4d39f5b72a7e14;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index 308e7d0..135ff74 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@
 #
 # Makefile for libsvgtiny
 #
-# Copyright 2009-1015 John-Mark Bell <jmb@netsurf-browser.org>
+# Copyright 2009-2015 John-Mark Bell <jmb@netsurf-browser.org>
 
 # Component settings
 COMPONENT := svgtiny
-COMPONENT_VERSION := 0.1.3
+COMPONENT_VERSION := 0.1.7
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -15,7 +15,8 @@ PREFIX ?= /opt/netsurf
 NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
 include $(NSSHARED)/makefiles/Makefile.tools
 
-TESTRUNNER := $(ECHO)
+# Reevaluate when used, as BUILDDIR won't be defined yet
+TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT)
 
 # Toolchain flags
 WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -38,15 +39,15 @@ else
   CFLAGS := $(CFLAGS) -Dinline="__inline__"
 endif
 
-# libdom
+# libcss, libdom, libwapcaplet
 ifneq ($(PKGCONFIG),)
   CFLAGS := $(CFLAGS) \
-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet)
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libcss libdom libwapcaplet)
   LDFLAGS := $(LDFLAGS) -lm \
-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet)
+		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libcss libdom libwapcaplet)
 else
   CFLAGS := $(CFLAGS) -I$(PREFIX)/include
-  LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm
+  LDFLAGS := $(CFLAGS) -lcss -ldom -lwapcaplet -lexpat -lm
 endif
 
 include $(NSBUILD)/Makefile.top