From 25c75a54960bdacccb005d055ae5198298d07a8b Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 23 Apr 2013 14:05:42 +0200
Subject: update Makefile

---
 Makefile    | 47 +++++++++++++++++++++++++++--------------------
 mkglyphlist |  8 +++++---
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index ae850ff..003bcfb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,32 @@
 # Makefile for luaotfload
 
-NAME   = luaotfload
-DOC    = $(NAME).pdf
-DTX    = $(NAME).dtx
-OTFL   = $(wildcard otfl-*.lua) otfl-blacklist.cnf font-age.lua
-SCRIPT = mkluatexfontdb.lua
+NAME         = luaotfload
+DOC          = $(NAME).pdf
+DTX          = $(NAME).dtx
+OTFL         = $(wildcard otfl-*.lua) otfl-blacklist.cnf font-age.lua
+SCRIPT       = fontdbutil
+GLYPHSCRIPT  = mkglyphlist
 
 GRAPH  = filegraph
 DOTPDF = $(GRAPH).pdf
 DOT    = $(GRAPH).dot
 
 # Files grouped by generation mode
-GRAPHED  = $(DOTPDF)
-COMPILED = $(DOC)
-UNPACKED = luaotfload.sty luaotfload.lua
-GENERATED = $(GRAPHED) $(COMPILED) $(UNPACKED)
-SOURCE = $(DTX) $(OTFL) README Makefile NEWS $(SCRIPT)
+GLYPHS      = font-age.lua
+GRAPHED     = $(DOTPDF)
+COMPILED    = $(DOC)
+UNPACKED    = luaotfload.sty luaotfload.lua
+GENERATED   = $(GRAPHED) $(COMPILED) $(UNPACKED) $(GLYPHS)
+SOURCE 		= $(DTX) $(OTFL) README Makefile NEWS $(SCRIPT) $(GLYPHSCRIPT)
 
 # test files
-TESTDIR = tests
-TESTFILES = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx)
-TESTFILES_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
-TESTFILES_TL = $(filter-out $(TESTFILES_SYS), $(TESTFILES))
+TESTDIR 		= tests
+TESTFILES 		= $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx)
+TESTFILES_SYS 	= $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
+TESTFILES_TL 	= $(filter-out $(TESTFILES_SYS), $(TESTFILES))
 
 # Files grouped by installation location
-SCRIPTFILES = $(SCRIPT)
+SCRIPTFILES = $(SCRIPT) $(GLYPHSCRIPT)
 RUNFILES    = $(UNPACKED) $(OTFL)
 DOCFILES    = $(DOC) README NEWS
 SRCFILES    = $(DTX) Makefile
@@ -42,21 +44,26 @@ SRCDIR    = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
 TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME)
 
 CTAN_ZIP = $(NAME).zip
-TDS_ZIP = $(NAME).tds.zip
-ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
+TDS_ZIP  = $(NAME).tds.zip
+ZIPS 	 = $(CTAN_ZIP) $(TDS_ZIP)
 
-DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_LATEX = latexmk -pdf -pdflatex=lualatex -silent $< >/dev/null
-DO_GRAPHVIZ = dot -Tpdf -o $@ $< > /dev/null
+DO_TEX 			= tex --interaction=batchmode $< >/dev/null
+DO_LATEX 		= latexmk -pdf -pdflatex=lualatex -silent $< >/dev/null
+DO_GRAPHVIZ 	= dot -Tpdf -o $@ $< > /dev/null
+DO_GLYPHLIST 	= texlua ./mkglyphlist > /dev/null
 
 all: $(GENERATED)
 graph: $(GRAPHED)
 doc: $(GRAPHED) $(COMPILED)
 unpack: $(UNPACKED)
+glyphs: $(GLYPHS)
 ctan: check $(CTAN_ZIP)
 tds: $(TDS_ZIP)
 world: all ctan
 
+$(GLYPHS): /dev/null
+	$(DO_GLYPHLIST)
+
 $(GRAPHED): $(DOT)
 	$(DO_GRAPHVIZ)
 
diff --git a/mkglyphlist b/mkglyphlist
index 954ffef..9ee1528 100755
--- a/mkglyphlist
+++ b/mkglyphlist
@@ -19,9 +19,11 @@ local glyph_source  = "http://partners.adobe.com/public/developer/en/opentype/gl
 -----------------------------------------------------------------------
 require"lpeg"
 require"socket"
-require"lualibs-lua"
-require"lualibs-lpeg"
-require"lualibs-table" --- for serialization
+
+kpse.set_program_name"luatex"
+dofile(kpse.find_file("lualibs-lua.lua",   "lua"))
+dofile(kpse.find_file("lualibs-lpeg.lua",  "lua"))
+dofile(kpse.find_file("lualibs-table.lua", "lua")) --- for serialization
 
 local C, Cf, Cg, Ct, P, R =
   lpeg.C, lpeg.Cf, lpeg.Cg, lpeg.Ct, lpeg.P, lpeg.R
-- 
cgit v1.2.3