diff options
| author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2012-06-29 19:56:11 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2012-06-29 19:56:11 +0000 |
| commit | 3eadc719b287f36fe9afbd05131a4fd4fbe34202 (patch) | |
| tree | 73b6d79f64c43dafcbed149d4505fb089f58b1b7 | |
| parent | cad96b5b8f2281a9b6cdebdb3985a05548e155e8 (diff) | |
| download | librufl-3eadc719b287f36fe9afbd05131a4fd4fbe34202.tar.gz librufl-3eadc719b287f36fe9afbd05131a4fd4fbe34202.tar.bz2 | |
Update to new NSBUILD infrastructure
svn path=/trunk/rufl/; revision=14012
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | build/tools/makeglyphs | 29 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | test/Makefile | 2 |
4 files changed, 6 insertions, 33 deletions
@@ -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 |