summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:20 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:55:20 (GMT)
commit3786bf0e01a61ad32f841881b0e926940bcf6715 (patch)
tree0b2203b6d68289cbffb6c8f4c31f57f4293282ea
parent3b09b1c30b721b6fe1b63d49b9a9e67eff721206 (diff)
downloadlibcss-3786bf0e01a61ad32f841881b0e926940bcf6715.tar.gz
libcss-3786bf0e01a61ad32f841881b0e926940bcf6715.tar.bz2
Update to new NSBUILD infrastructure
svn path=/trunk/libcss/; revision=14004
-rw-r--r--Makefile8
-rw-r--r--src/Makefile2
-rw-r--r--src/bytecode/Makefile2
-rw-r--r--src/charset/Makefile2
-rw-r--r--src/lex/Makefile2
-rw-r--r--src/parse/Makefile2
-rw-r--r--src/parse/properties/Makefile2
-rw-r--r--src/select/Makefile2
-rw-r--r--src/select/properties/Makefile2
-rw-r--r--src/utils/Makefile2
-rw-r--r--test/Makefile2
11 files changed, 15 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index abe1113..a77d199 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@ COMPONENT_VERSION := 0.1.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 := $(PERL) build/testtools/testrunner.pl
+TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
# Toolchain flags
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
@@ -39,7 +41,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
I := /include/libcss
diff --git a/src/Makefile b/src/Makefile
index fbeaa12..0584f42 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := stylesheet.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/bytecode/Makefile b/src/bytecode/Makefile
index b322cde..699d69f 100644
--- a/src/bytecode/Makefile
+++ b/src/bytecode/Makefile
@@ -1,3 +1,3 @@
# Sources
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/charset/Makefile b/src/charset/Makefile
index 7cc517e..19d43ea 100644
--- a/src/charset/Makefile
+++ b/src/charset/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := detect.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/lex/Makefile b/src/lex/Makefile
index a14073a..ba250f9 100644
--- a/src/lex/Makefile
+++ b/src/lex/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := lex.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/parse/Makefile b/src/parse/Makefile
index 3d1df42..99f55d0 100644
--- a/src/parse/Makefile
+++ b/src/parse/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := parse.c language.c important.c propstrings.c font_face.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/parse/properties/Makefile b/src/parse/properties/Makefile
index ebf4de3..2b84354 100644
--- a/src/parse/properties/Makefile
+++ b/src/parse/properties/Makefile
@@ -68,4 +68,4 @@ PRE_TARGETS := $(foreach AP,$(AUTOGEN_PARSERS),src/parse/properties/autogenerate
DISTCLEAN_ITEMS := $(foreach AP,$(AUTOGEN_PARSERS),src/parse/properties/autogenerated_$(AP).c)
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/select/Makefile b/src/select/Makefile
index b99eab3..eb89c1f 100644
--- a/src/select/Makefile
+++ b/src/select/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := computed.c dispatch.c hash.c select.c font_face.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/select/properties/Makefile b/src/select/properties/Makefile
index f9e6580..a557846 100644
--- a/src/select/properties/Makefile
+++ b/src/select/properties/Makefile
@@ -112,4 +112,4 @@ windows.c \
word_spacing.c \
z_index.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/src/utils/Makefile b/src/utils/Makefile
index ab5e2c7..c317eea 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1,4 +1,4 @@
# Sources
DIR_SOURCES := errors.c utils.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index 64257ef..c4d7eee 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,4 +4,4 @@ DIR_TEST_ITEMS := csdetect:csdetect.c css21:css21.c lex:lex.c \
parse:parse.c parse-auto:parse-auto.c parse2-auto:parse2-auto.c \
select-auto:select-auto.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir