From 3526f1b2ccbb0fb8d2bb1fc344294f28f47e2222 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Fri, 29 Jun 2012 19:55:42 +0000
Subject: Update to new NSBUILD infrastructure

svn path=/trunk/libnsfb/; revision=14007
---
 Makefile             | 6 ++++--
 src/Makefile         | 2 +-
 src/plot/Makefile    | 2 +-
 src/surface/Makefile | 2 +-
 test/Makefile        | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9dd1ead..1fd4d47 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ COMPONENT_VERSION := 0.0.2
 COMPONENT_TYPE ?= lib-static
 
 # Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
 
 # Reevaluate when used, as BUILDDIR won't be defined yet
 TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT)
@@ -78,7 +80,7 @@ endif
 
 TESTLDFLAGS := -lm -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive $(TESTLDFLAGS)
 
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
 I := /include
diff --git a/src/Makefile b/src/Makefile
index 90cde9b..283a99f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
 # Sources
 DIR_SOURCES := libnsfb.c dump.c cursor.c
 
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/plot/Makefile b/src/plot/Makefile
index 0c51c02..e99f440 100644
--- a/src/plot/Makefile
+++ b/src/plot/Makefile
@@ -1,4 +1,4 @@
 # Sources
 DIR_SOURCES := api.c util.c generic.c 32bpp.c 16bpp.c 8bpp.c
 
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/surface/Makefile b/src/surface/Makefile
index 21547a5..012d9cd 100644
--- a/src/surface/Makefile
+++ b/src/surface/Makefile
@@ -13,4 +13,4 @@ ifeq ($(NSFB_VNC_AVAILABLE),yes)
   DIR_SOURCES := $(DIR_SOURCES) vnc.c
 endif
 
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index 7f2d40e..c11f489 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,3 @@
 DIR_TEST_ITEMS := plottest:plottest.c bitmap:bitmap.c;nsglobe.c frontend:frontend.c bezier:bezier.c path:path.c polygon:polygon.c polystar:polystar.c polystar2:polystar2.c
 
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
-- 
cgit v1.2.3