diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | bindings/Makefile | 4 | ||||
| -rw-r--r-- | bindings/hubbub/Makefile | 2 | ||||
| -rw-r--r-- | bindings/xml/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/core/Makefile | 2 | ||||
| -rw-r--r-- | src/events/Makefile | 2 | ||||
| -rw-r--r-- | src/html/Makefile | 2 | ||||
| -rw-r--r-- | src/utils/Makefile | 2 | ||||
| -rw-r--r-- | test/Makefile | 2 |
10 files changed, 18 insertions, 12 deletions
@@ -5,9 +5,11 @@ COMPONENT_VERSION := 0.0.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 -TESTRUNNER := $(PERL) build/testtools/testrunner.pl +TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl # Toolchain flags WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ @@ -41,7 +43,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) endif endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top # Extra installation rules Is := include/dom diff --git a/bindings/Makefile b/bindings/Makefile index 26e4927..f89808c 100644 --- a/bindings/Makefile +++ b/bindings/Makefile @@ -1 +1,3 @@ -include build/makefiles/Makefile.subdir +# Bindings + +include $(NSBUILD)/Makefile.subdir diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile index 59b7d3b..946219d 100644 --- a/bindings/hubbub/Makefile +++ b/bindings/hubbub/Makefile @@ -13,5 +13,5 @@ ifeq ($(WITH_HUBBUB_BINDING),yes) endif endif -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile index 12b4ca0..e75e362 100644 --- a/bindings/xml/Makefile +++ b/bindings/xml/Makefile @@ -29,5 +29,5 @@ ifeq ($(DO_XML_INSTALL),yes) DIR_INSTALL_ITEMS := /include/dom/bindings/libxml:xmlerror.h;xmlparser.h endif -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/Makefile b/src/Makefile index 26e4927..41848b1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1 +1,3 @@ -include build/makefiles/Makefile.subdir +# Src + +include $(NSBUILD)/Makefile.subdir diff --git a/src/core/Makefile b/src/core/Makefile index c9da9c1..41fd51f 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -8,4 +8,4 @@ DIR_SOURCES := \ cdatasection.c document_type.c entity_ref.c pi.c \ doc_fragment.c document.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/events/Makefile b/src/events/Makefile index a842e2f..54234b4 100644 --- a/src/events/Makefile +++ b/src/events/Makefile @@ -4,4 +4,4 @@ DIR_SOURCES := event.c dispatch.c event_target.c document_event.c \ text_event.c event_listener.c mouse_event.c mutation_event.c \ ui_event.c mouse_multi_wheel_event.c mutation_name_event.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/html/Makefile b/src/html/Makefile index a154a99..203f828 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -22,4 +22,4 @@ UNINMPLEMENTED_SOURCES := html_optgroup_element.c \ html_tablecell_element.c html_frameset_element.c html_frame_element.c \ html_iframe_element.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/src/utils/Makefile b/src/utils/Makefile index 1ab8bad..4bb586f 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := namespace.c hashtable.c character_valid.c validate.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir diff --git a/test/Makefile b/test/Makefile index 37e0489..46854f4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -59,5 +59,5 @@ $(eval $(call do_xml_suite,level1/html,dom1-interfaces.xml)) DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(DIR)INDEX -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir |