summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:49 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:49 +0000
commit1ad808fd9b45fe40b26458989c8abd74122e0675 (patch)
treed6e27efe63d7630c75005dec32d9548fe71eb7ff
parent3bec1ff9aeebb3ccba8cbc2a2fe81ab1902c2b5c (diff)
downloadlibnsbmp-1ad808fd9b45fe40b26458989c8abd74122e0675.tar.gz
libnsbmp-1ad808fd9b45fe40b26458989c8abd74122e0675.tar.bz2
Update to new NSBUILD infrastructure
svn path=/trunk/libnsbmp/; revision=14008
-rw-r--r--Makefile6
-rw-r--r--src/Makefile2
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dd9b5b6..ca87fea 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ COMPONENT_VERSION := 0.0.3
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
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -24,7 +26,7 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
I := /include/
diff --git a/src/Makefile b/src/Makefile
index c46200b..e004231 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := libnsbmp.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir