X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=135ff74a7163d8d7bc9fb57346886481d9041681;hb=aa4b2d7b7b628407f6361c6b5c5a4ad2b0176877;hp=4563b6af0fa2ae0c7a2b89a9d5e8ad81d252263e;hpb=4559e3f11b0c5ed68a0238317b3e6096993f8e5b;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index 4563b6a..135ff74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,12 @@
+#!/bin/make
+#
+# Makefile for libsvgtiny
+#
+# 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
 
@@ -9,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 \
@@ -22,8 +29,9 @@ ifneq ($(BUILD),i586-pc-haiku)
   endif
 endif
 
-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
-	-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+CFLAGS := -D_BSD_SOURCE -D_DEFAULT_SOURCE \
+	-I$(CURDIR)/include/ -I$(CURDIR)/src \
+	$(WARNFLAGS) $(CFLAGS)
 ifneq ($(GCCVER),2)
   CFLAGS := $(CFLAGS) -std=c99
 else
@@ -31,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