summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:12 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:12 (GMT)
commitf9d1b53a01bcea5916c41ede3e06e00774444df5 (patch)
tree32bea2aa78ab939b750ee652e53aceea59d11a20
parent0dc7a60ac84aa80e1b0fbf72d83da53f66a366a3 (diff)
downloadlibwapcaplet-f9d1b53a01bcea5916c41ede3e06e00774444df5.tar.gz
libwapcaplet-f9d1b53a01bcea5916c41ede3e06e00774444df5.tar.bz2
Update to new NSBUILD infrastructure
svn path=/trunk/libwapcaplet/; revision=14002
-rw-r--r--Makefile6
-rw-r--r--src/Makefile2
-rw-r--r--test/Makefile2
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index fedbd38..aac8e86 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ COMPONENT_VERSION := 0.1.1
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 = $(BUILDDIR)/test_testrunner$(EXEEXT)
@@ -27,7 +29,7 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
ifeq ($(WANT_TEST),yes)
ifneq ($(PKGCONFIG),)
diff --git a/src/Makefile b/src/Makefile
index e0251a3..4e03048 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,3 @@
DIR_SOURCES := libwapcaplet.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index 2ba343a..36d5092 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,3 @@
DIR_TEST_ITEMS := testrunner:testmain.c;basictests.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir