From 3eadc719b287f36fe9afbd05131a4fd4fbe34202 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Fri, 29 Jun 2012 19:56:11 +0000
Subject: Update to new NSBUILD infrastructure

svn path=/trunk/rufl/; revision=14012
---
 Makefile               |  6 ++++--
 build/tools/makeglyphs | 29 -----------------------------
 src/Makefile           |  2 +-
 test/Makefile          |  2 +-
 4 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100755 build/tools/makeglyphs

diff --git a/Makefile b/Makefile
index 6928eb6..a24ef15 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ 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 := $(ECHO)
 
@@ -35,7 +37,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
   endif
 endif
 
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
 I := /include
diff --git a/build/tools/makeglyphs b/build/tools/makeglyphs
deleted file mode 100755
index 6acb350..0000000
--- a/build/tools/makeglyphs
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl -W
-
-%name = ();
-
-print "#include <stdlib.h>\n";
-print "#include \"rufl_internal.h\"\n";
-print "const struct rufl_glyph_map_entry rufl_glyph_map[] = {\n";
-print "\t{\" \", 0},  /* sentinel */\n";
-
-while (<>) {
-	if (/^([0-9A-F]{4});([a-zA-Z0-9]+);/) {
-		$name{"$1:$2"} = 1;
-	}
-}
-
-@glyph = ();
-while (($un, ) = each %name) {
-	($u, $n) = split ':', $un;
-	push @glyph, [$n, $u];
-}
-
-foreach $z (sort {$$a[0] cmp $$b[0] or $$a[1] cmp $$b[1]} @glyph) {
-	print "\t{\"$$z[0]\", 0x$$z[1]},\n";
-}
-
-print "\t{\"~\", 0}  /* sentinel */\n";
-print "};\n";
-print "const size_t rufl_glyph_map_size = sizeof rufl_glyph_map /\n";
-print "		sizeof rufl_glyph_map[0];\n";
diff --git a/src/Makefile b/src/Makefile
index 2c29500..73974aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,4 +13,4 @@ $(BUILDDIR)/rufl_glyph_map.c: src/Glyphs
 	$(VQ)$(ECHO) "MKGLYPHS: $<"
 	$(Q)$(PERL) build/tools/makeglyphs < $< > $@
 
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index 30e1600..2bfa58b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -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
-- 
cgit v1.2.3