r14012 dsilvers - in /trunk/rufl: Makefile build/ build/tools/ src/Makefile test/Makefile
Author: dsilvers
Date: Fri Jun 29 14:56:11 2012
New Revision: 14012
URL: http://source.netsurf-browser.org?rev=14012&view=rev
Log:
Update to new NSBUILD infrastructure
Removed:
trunk/rufl/build/tools/
Modified:
trunk/rufl/Makefile
trunk/rufl/build/ (props changed)
trunk/rufl/src/Makefile
trunk/rufl/test/Makefile
Modified: trunk/rufl/Makefile
URL:
http://source.netsurf-browser.org/trunk/rufl/Makefile?rev=14012&r1=14...
==============================================================================
--- trunk/rufl/Makefile (original)
+++ trunk/rufl/Makefile Fri Jun 29 14:56:11 2012
@@ -5,7 +5,9 @@
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)
@@ -35,7 +37,7 @@
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
I := /include
Propchange: trunk/rufl/build/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Jun 29 14:56:11 2012
@@ -1,1 +1,1 @@
-makefiles svn://svn.netsurf-browser.org/trunk/tools/buildsystem/makefiles
+
Modified: trunk/rufl/src/Makefile
URL:
http://source.netsurf-browser.org/trunk/rufl/src/Makefile?rev=14012&r...
==============================================================================
--- trunk/rufl/src/Makefile (original)
+++ trunk/rufl/src/Makefile Fri Jun 29 14:56:11 2012
@@ -13,4 +13,4 @@
$(VQ)$(ECHO) "MKGLYPHS: $<"
$(Q)$(PERL) build/tools/makeglyphs < $< > $@
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
Modified: trunk/rufl/test/Makefile
URL:
http://source.netsurf-browser.org/trunk/rufl/test/Makefile?rev=14012&...
==============================================================================
--- trunk/rufl/test/Makefile (original)
+++ trunk/rufl/test/Makefile Fri Jun 29 14:56:11 2012
@@ -1,4 +1,4 @@
# Tests
DIR_TEST_ITEMS := rufl_test:rufl_test.c rufl_chars:rufl_chars.c
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir