From f9d1b53a01bcea5916c41ede3e06e00774444df5 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 29 Jun 2012 19:55:12 +0000 Subject: Update to new NSBUILD infrastructure svn path=/trunk/libwapcaplet/; revision=14002 --- Makefile | 6 ++++-- src/Makefile | 2 +- test/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fedbd38..aac8e86 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,9 @@ 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 # Reevaluate when used, as BUILDDIR won't be defined yet TESTRUNNER = $(BUILDDIR)/test_testrunner$(EXEEXT) @@ -27,7 +29,7 @@ else CFLAGS := $(CFLAGS) -Dinline="__inline__" endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top ifeq ($(WANT_TEST),yes) ifneq ($(PKGCONFIG),) diff --git a/src/Makefile b/src/Makefile index e0251a3..4e03048 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,3 @@ DIR_SOURCES := libwapcaplet.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/test/Makefile b/test/Makefile index 2ba343a..36d5092 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,3 @@ DIR_TEST_ITEMS := testrunner:testmain.c;basictests.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir -- cgit v1.2.3