summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:17 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:17 (GMT)
commitf0525adcd70cec983dcb7a25a772bb82b34e65b7 (patch)
treef192f9399b1a0820b9a0d3c5eaf1484ad00cf735
parent90fa460dcbab22d6a59bd81a8c94ded8db704304 (diff)
downloadlibparserutils-f0525adcd70cec983dcb7a25a772bb82b34e65b7.tar.gz
libparserutils-f0525adcd70cec983dcb7a25a772bb82b34e65b7.tar.bz2
Update to new NSBUILD infrastructure
svn path=/trunk/libparserutils/; revision=14003
-rw-r--r--Makefile8
-rw-r--r--src/Makefile2
-rw-r--r--src/charset/Makefile2
-rw-r--r--src/charset/codecs/Makefile2
-rw-r--r--src/charset/encodings/Makefile2
-rw-r--r--src/input/Makefile2
-rw-r--r--src/utils/Makefile2
-rw-r--r--test/Makefile2
-rw-r--r--test/regression/Makefile2
9 files changed, 13 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 4b9b541..a6b7976 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@ 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
-TESTRUNNER := $(PERL) build/testtools/testrunner.pl
+TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -27,7 +29,7 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
Is := include/parserutils
diff --git a/src/Makefile b/src/Makefile
index 3cbaf86..f824677 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,2 +1,2 @@
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/charset/Makefile b/src/charset/Makefile
index 9d25f24..d6cec68 100644
--- a/src/charset/Makefile
+++ b/src/charset/Makefile
@@ -11,4 +11,4 @@ ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
CLEAN_ITEMS := $(CLEAN_ITEMS) $(DIR)aliases.inc
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/charset/codecs/Makefile b/src/charset/codecs/Makefile
index c9b920e..784b22a 100644
--- a/src/charset/codecs/Makefile
+++ b/src/charset/codecs/Makefile
@@ -2,4 +2,4 @@
DIR_SOURCES := codec_ascii.c codec_8859.c codec_ext8.c \
codec_utf8.c codec_utf16.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/charset/encodings/Makefile b/src/charset/encodings/Makefile
index 75fbfeb..b41f2a6 100644
--- a/src/charset/encodings/Makefile
+++ b/src/charset/encodings/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := utf8.c utf16.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/input/Makefile b/src/input/Makefile
index fc7a7ff..b971a1b 100644
--- a/src/input/Makefile
+++ b/src/input/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := filter.c inputstream.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/utils/Makefile b/src/utils/Makefile
index b290ef1..26185fd 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := buffer.c errors.c stack.c vector.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index afd38a7..b208c78 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,4 +4,4 @@ DIR_TEST_ITEMS := aliases:aliases.c cscodec-8859:cscodec-8859.c \
cscodec-utf16:cscodec-utf16.c filter:filter.c \
inputstream:inputstream.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/regression/Makefile b/test/regression/Makefile
index 2cdeaf7..c83de62 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -4,4 +4,4 @@ DIR_TEST_ITEMS := filter-segv:filter-segv.c \
CFLAGS := $(CFLAGS) -I$(CURDIR)/test
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir