Author: dsilvers Date: Fri Jun 29 14:55:42 2012 New Revision: 14007 URL: http://source.netsurf-browser.org?rev=14007&view=rev Log: Update to new NSBUILD infrastructure Removed: trunk/libnsfb/build/ Modified: trunk/libnsfb/Makefile trunk/libnsfb/src/Makefile trunk/libnsfb/src/plot/Makefile trunk/libnsfb/src/surface/Makefile trunk/libnsfb/test/Makefile Modified: trunk/libnsfb/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/Makefile?rev=14007&r1... ============================================================================== --- trunk/libnsfb/Makefile (original) +++ trunk/libnsfb/Makefile Fri Jun 29 14:55:42 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 # Reevaluate when used, as BUILDDIR won't be defined yet TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT) @@ -78,7 +80,7 @@ TESTLDFLAGS := -lm -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive $(TESTLDFLAGS) -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top # Extra installation rules I := /include Modified: trunk/libnsfb/src/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/src/Makefile?rev=14007&am... ============================================================================== --- trunk/libnsfb/src/Makefile (original) +++ trunk/libnsfb/src/Makefile Fri Jun 29 14:55:42 2012 @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := libnsfb.c dump.c cursor.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/libnsfb/src/plot/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/src/plot/Makefile?rev=140... ============================================================================== --- trunk/libnsfb/src/plot/Makefile (original) +++ trunk/libnsfb/src/plot/Makefile Fri Jun 29 14:55:42 2012 @@ -1,4 +1,4 @@ # Sources DIR_SOURCES := api.c util.c generic.c 32bpp.c 16bpp.c 8bpp.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/libnsfb/src/surface/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/Makefile?rev=... ============================================================================== --- trunk/libnsfb/src/surface/Makefile (original) +++ trunk/libnsfb/src/surface/Makefile Fri Jun 29 14:55:42 2012 @@ -13,4 +13,4 @@ DIR_SOURCES := $(DIR_SOURCES) vnc.c endif -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir Modified: trunk/libnsfb/test/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/test/Makefile?rev=14007&a... ============================================================================== --- trunk/libnsfb/test/Makefile (original) +++ trunk/libnsfb/test/Makefile Fri Jun 29 14:55:42 2012 @@ -1,3 +1,3 @@ DIR_TEST_ITEMS := plottest:plottest.c bitmap:bitmap.c;nsglobe.c frontend:frontend.c bezier:bezier.c path:path.c polygon:polygon.c polystar:polystar.c polystar2:polystar2.c -include build/makefiles/Makefile.subdir +include $(NSBUILD)/Makefile.subdir