summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 18:24:26 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 18:24:26 +0000
commitf4320d1b1ab7602c66fa8740f0d564a6ae40e837 (patch)
tree3e7b4fbe9a82085398b0f655c6a3d864c264aff5
parent3e0d4f191535e95cf46eda876dca465dfcf657a5 (diff)
downloadbuildsystem-f4320d1b1ab7602c66fa8740f0d564a6ae40e837.tar.gz
buildsystem-f4320d1b1ab7602c66fa8740f0d564a6ae40e837.tar.bz2
Allow Makefile.tools to find the test tools etc, and use NSSHARED as the root of everything
svn path=/trunk/tools/buildsystem/; revision=13997
-rw-r--r--example/Makefile4
-rw-r--r--makefiles/Makefile.tools4
2 files changed, 6 insertions, 2 deletions
diff --git a/example/Makefile b/example/Makefile
index 582fb69..1591aa8 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -6,7 +6,9 @@ COMPONENT_TYPE := lib-static
COMPONENT_VERSION := 0.0.1
# Tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Grab the core makefile
include $(NSBUILD)/Makefile.top
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 922e690..231181b 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -35,10 +35,12 @@ ifeq ($(BUILD),)
endif
###############################################################################
-# Determine path used to load us, so we can locate other makefiles
+# Determine path used to load us, so we can locate other makefiles etc
###############################################################################
NSBUILD := $(dir $(lastword $(MAKEFILE_LIST)))
+NSSHARED := $(dir $(NSBUILD))
+NSTESTTOOLS := $(NSSHARED)/testtools
###############################################################################
# Host/target platform detection