From b9b4c3c90eea9b00da17d0cbdce195d715fdb01a Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 29 Jun 2012 19:56:04 +0000 Subject: [PATCH] Update to new NSBUILD infrastructure svn path=/trunk/libsvgtiny/; revision=14010 --- Makefile | 6 ++++-- src/Makefile | 2 +- test/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2933bb0..fe4cfe7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,9 @@ COMPONENT_VERSION := 0.0.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 := $(ECHO) @@ -43,7 +45,7 @@ else LDFLAGS := $(CFLAGS) -lxml2 endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top # Extra installation rules I := /include diff --git a/src/Makefile b/src/Makefile index 43dbc3f..a979720 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,4 +10,4 @@ $(BUILDDIR)/src_colors.c: src/colors.gperf $(Q)$(SED) -e 's/#ifdef __GNUC_STDC_INLINE__/#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/' $@.tmp >$@ $(Q)$(RM) $@.tmp -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/test/Makefile b/test/Makefile index d37b66a..84a0cbe 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ # Tests DIR_TEST_ITEMS := svgtiny_test:svgtiny_test.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir -- 2.43.2