From 0108482adcab2519b8328bbd748919510907633d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 17 Jul 2012 20:42:41 +0100 Subject: convert to new build targets --- Makefile | 6 ++++-- src/Makefile | 2 +- test/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e93d3d8..03cc244 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,9 @@ COMPONENT_VERSION := 0.0.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 := $(ECHO) @@ -46,7 +48,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) endif endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top # Extra installation rules I := /include diff --git a/src/Makefile b/src/Makefile index 99d4a1a..8dc580b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := pencil_build.c pencil_save.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/test/Makefile b/test/Makefile index 2df56da..bf6a27e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ # Tests DIR_TEST_ITEMS := pencil_test:pencil_test.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir -- cgit v1.2.3