summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:56:07 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:56:07 (GMT)
commit5cd189240b1edd74063361a82ae917a1a1369776 (patch)
tree3a0c728bb1ae41dea64ec99d55b6213e5aa5dc99
parent1362ff679cc43c9e864af0069c60e53f3cda5213 (diff)
downloadiconv-5cd189240b1edd74063361a82ae917a1a1369776.tar.gz
iconv-5cd189240b1edd74063361a82ae917a1a1369776.tar.bz2
Update to new NSBUILD infrastructure
svn path=/trunk/iconv/; revision=14011
-rw-r--r--Makefile8
-rw-r--r--aliases/Makefile2
-rw-r--r--module/Makefile2
-rw-r--r--src/Makefile2
-rw-r--r--test/GNU/Makefile2
-rw-r--r--test/Makefile2
6 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 61ad100..7943f72 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@ COMPONENT_VERSION := 0.12.0
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
ifneq ($(HOST),riscos)
export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
@@ -26,7 +28,7 @@ else
LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib -lunicode
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
I := /include/iconv
diff --git a/aliases/Makefile b/aliases/Makefile
index 119181c..ab0ebae 100644
--- a/aliases/Makefile
+++ b/aliases/Makefile
@@ -20,4 +20,4 @@ $(makealiases): $(addprefix $(DIR), $(makealiases_SRCS))
POST_TARGETS := $(POST_TARGETS) $(aliases)
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/module/Makefile b/module/Makefile
index 90114cf..86e68d8 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -4,4 +4,4 @@ endif
DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/Makefile b/src/Makefile
index 533c878..2a7d350 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := alias.c aliases.c eightbit.c iconv.c utils.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/GNU/Makefile b/test/GNU/Makefile
index 0daa5f6..a4efafa 100644
--- a/test/GNU/Makefile
+++ b/test/GNU/Makefile
@@ -163,4 +163,4 @@ TEST_TARGETS := $(TEST_TARGETS) testGNU
DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(DIR)/UTF-8.TXT $(DIR)/GB18030.TXT
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index a1a8c08..343cd3f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
# Tests
DIR_TEST_ITEMS := iconv:iconv.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir