Update to new NSBUILD infrastructure

svn path=/trunk/libsvgtiny/; revision=14010

diff --git a/Makefile b/Makefile
index 2933bb03bc7d651b80e0a12fa41506b192714202..fe4cfe7b71f31aa46f934d6cc9fa6dda38e6a384 100644 (file)
--- 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 43dbc3f0115132925230874902d2f043904266fc..a97972023257ad80ffe5f1639b616294dac7bcf5 100644 (file)
--- 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 d37b66a585dd45e105965d074e739848987afdcc..84a0cbeab8c8229a5c756eee39c37b3830820991 100644 (file)
--- 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