From a256763c038714124858954cc3c4fc024191dfdd Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 29 Jun 2012 19:55:35 +0000 Subject: Update to new NSBUILD infrastructure svn path=/trunk/hubbub/; revision=14006 --- Makefile | 8 +++++--- src/Makefile | 2 +- src/charset/Makefile | 2 +- src/tokeniser/Makefile | 2 +- src/treebuilder/Makefile | 2 +- src/utils/Makefile | 2 +- test/Makefile | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 425c0bf..396bd76 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,11 @@ COMPONENT_VERSION := 0.1.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 -TESTRUNNER := $(PERL) build/testtools/testrunner.pl +TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl # Toolchain flags WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ @@ -39,7 +41,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) endif endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top ifeq ($(WANT_TEST),yes) # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/ diff --git a/src/Makefile b/src/Makefile index 6fd9406..ed7fa17 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := parser.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/charset/Makefile b/src/charset/Makefile index c97d758..b77941d 100644 --- a/src/charset/Makefile +++ b/src/charset/Makefile @@ -1,3 +1,3 @@ DIR_SOURCES := detect.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/tokeniser/Makefile b/src/tokeniser/Makefile index aaa089b..c391502 100644 --- a/src/tokeniser/Makefile +++ b/src/tokeniser/Makefile @@ -11,4 +11,4 @@ ifeq ($(findstring clean,$(MAKECMDGOALS)),clean) CLEAN_ITEMS := $(CLEAN_ITEMS) $(DIR)entities.inc endif -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/treebuilder/Makefile b/src/treebuilder/Makefile index 0bc8c25..31feae1 100644 --- a/src/treebuilder/Makefile +++ b/src/treebuilder/Makefile @@ -8,4 +8,4 @@ DIR_SOURCES := treebuilder.c \ after_frameset.c after_after_body.c after_after_frameset.c \ generic_rcdata.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/utils/Makefile b/src/utils/Makefile index 237c2bd..e419321 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := errors.c string.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/test/Makefile b/test/Makefile index 916b89f..cc5d1e5 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,4 +4,4 @@ DIR_TEST_ITEMS := csdetect:csdetect.c entities:entities.c \ tokeniser2:tokeniser2.c tokeniser3:tokeniser3.c tree:tree.c \ tree2:tree2.c tree-buf:tree-buf.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir -- cgit v1.2.3