Author: dsilvers Date: Fri Jun 29 14:56:07 2012 New Revision: 14011 URL: http://source.netsurf-browser.org?rev=14011&view=rev Log: Update to new NSBUILD infrastructure Modified: trunk/iconv/Makefile trunk/iconv/aliases/Makefile trunk/iconv/build/ (props changed) trunk/iconv/module/Makefile trunk/iconv/src/Makefile trunk/iconv/test/GNU/Makefile trunk/iconv/test/Makefile Modified: trunk/iconv/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/Makefile?rev=14011&r1=1... ============================================================================== --- trunk/iconv/Makefile (original) +++ trunk/iconv/Makefile Fri Jun 29 14:56:07 2012 @@ -5,9 +5,11 @@ 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 ifneq ($(HOST),riscos) export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/ @@ -26,7 +28,7 @@ LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib -lunicode endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top # Extra installation rules I := /include/iconv Modified: trunk/iconv/aliases/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/aliases/Makefile?rev=14011&... ============================================================================== --- trunk/iconv/aliases/Makefile (original) +++ trunk/iconv/aliases/Makefile Fri Jun 29 14:56:07 2012 @@ -20,4 +20,4 @@ POST_TARGETS := $(POST_TARGETS) $(aliases) -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Propchange: trunk/iconv/build/ ------------------------------------------------------------------------------ --- svn:externals (original) +++ svn:externals Fri Jun 29 14:56:07 2012 @@ -1,2 +1,1 @@ -makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles -testtools svn://svn.netsurf-browser.org/trunk/tools/buildsystem/testtools + Modified: trunk/iconv/module/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/module/Makefile?rev=14011&a... ============================================================================== --- trunk/iconv/module/Makefile (original) +++ trunk/iconv/module/Makefile Fri Jun 29 14:56:07 2012 @@ -4,4 +4,4 @@ DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/iconv/src/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/src/Makefile?rev=14011&... ============================================================================== --- trunk/iconv/src/Makefile (original) +++ trunk/iconv/src/Makefile Fri Jun 29 14:56:07 2012 @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := alias.c aliases.c eightbit.c iconv.c utils.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/iconv/test/GNU/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/test/GNU/Makefile?rev=14011... ============================================================================== --- trunk/iconv/test/GNU/Makefile (original) +++ trunk/iconv/test/GNU/Makefile Fri Jun 29 14:56:07 2012 @@ -163,4 +163,4 @@ DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(DIR)/UTF-8.TXT $(DIR)/GB18030.TXT -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/iconv/test/Makefile URL: http://source.netsurf-browser.org/trunk/iconv/test/Makefile?rev=14011&... ============================================================================== --- trunk/iconv/test/Makefile (original) +++ trunk/iconv/test/Makefile Fri Jun 29 14:56:07 2012 @@ -1,4 +1,4 @@ # Tests DIR_TEST_ITEMS := iconv:iconv.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir