X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=135ff74a7163d8d7bc9fb57346886481d9041681;hb=a5bf4ea6e6f6f3f9623cb63963e591f030396fa7;hp=9466bcd1313a237b8d6421f1dc2d2f1b3af6e9d1;hpb=4e4c0d2c2abb1e576aa91791ae660bc8f2b9c77a;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index 9466bcd..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.2
+COMPONENT_VERSION := 0.1.7
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -9,21 +15,23 @@ 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 \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -pedantic
 # BeOS/Haiku/AmigaOS standard library headers create warnings
-ifneq ($(TARGET),beos)
-  ifneq ($(TARGET),amiga)
+ifneq ($(BUILD),i586-pc-haiku)
+  ifneq ($(findstring amigaos,$(BUILD)),amigaos)
     WARNFLAGS := $(WARNFLAGS) -Werror
   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,21 +39,21 @@ 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
 
 # Extra installation rules
-I := /include
+I := /$(INCLUDEDIR)
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
 INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)