X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=6511191fd38f92511187f2dd20f00fc754a7d58e;hb=HEAD;hp=fe6f657c9830ac5f3119c829c4f9bc5980004ff3;hpb=e368730948266bb88347ace7a1da642a4f8781a2;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index fe6f657..6511191 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.0
+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
@@ -45,7 +53,7 @@ endif
 include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
-I := /include
+I := /$(INCLUDEDIR)
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
+INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)