From 56b0d91f4dc7416538ac4c1af04c52ac5bf5929b Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 8 Dec 2014 20:29:21 +0100
Subject: [*] reorganize src/ subtree

This moves the fontloader files into a separate subdirectory to simplify
maintainance.
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4124a1a..60dec60 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,12 @@ NAME		= luaotfload
 DOCSRCDIR	= ./doc
 SCRIPTSRCDIR	= ./scripts
 SRCSRCDIR	= ./src
+FONTLOADERDIR	= $(SRCSRCDIR)/fontloader
 BUILDDIR	= ./build
 MISCDIR		= ./misc
 
 SRC		= $(wildcard $(SRCSRCDIR)/luaotfload-*.lua)
+SRC		+= $(wildcard $(FONTLOADERDIR)/*.lua)
 SRC		+= $(SRCSRCDIR)/luaotfload.sty
 SRC		+= $(MISCDIR)/luaotfload-blacklist.cnf
 
-- 
cgit v1.2.3


From 61d4a9200d0ba19b7472386c713a4aba564ba93e Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 8 Dec 2014 20:33:40 +0100
Subject: [build] include cleanup targets in makefile usage message

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 60dec60..17f583f 100644
--- a/Makefile
+++ b/Makefile
@@ -227,5 +227,8 @@ showtargets:
 	@echo "       ctan        package a zipball for uploading to CTAN"
 	@echo "       sign        sign zipball"
 	@echo
+	@echo "       clean       cleanup side-effects"
+	@echo "       mrproper    cleanup side-effects as well as make targets"
+	@echo
 
 # vim:noexpandtab:tabstop=8:shiftwidth=2
-- 
cgit v1.2.3


From 3cf2dcca26bee734bc2ba867ff5709af712c8df0 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 8 Dec 2014 22:34:37 +0100
Subject: [build] include import script in makefile

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 17f583f..b3fce99 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ CONFDEMO	= $(MISCDIR)/luaotfload.conf.example
 GLYPHSCRIPT	= $(SCRIPTSRCDIR)/mkglyphlist
 CHARSCRIPT	= $(SCRIPTSRCDIR)/mkcharacters
 STATUSSCRIPT	= $(SCRIPTSRCDIR)/mkstatus
+IMPORTSCRIPT	= $(SCRIPTSRCDIR)/mkimport
 
 GLYPHSOURCE	= $(BUILDDIR)/glyphlist.txt
 
@@ -88,6 +89,7 @@ LUA		= texlua
 DO_GLYPHS	= $(LUA) $(GLYPHSCRIPT) > /dev/null
 DO_CHARS	= $(LUA) $(CHARSCRIPT)  > /dev/null
 DO_STATUS	= $(LUA) $(STATUSSCRIPT)  > /dev/null
+DO_IMPORT	= $(LUA) $(IMPORTSCRIPT)  > /dev/null
 
 define check-lua-files
 @echo validating syntax
@@ -179,7 +181,7 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) check
 
 sign: $(CTAN_ZIPSIG)
 
-.PHONY: install manifest clean mrproper show showtargets check
+.PHONY: install manifest clean mrproper show showtargets check import news
 
 install: $(ALL_STATUS)
 	@echo "Installing in '$(TEXMFROOT)'."
-- 
cgit v1.2.3


From 3247d7476f65bcc7164764fc373c171c67e813e7 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 9 Dec 2014 22:56:29 +0100
Subject: [build] update import path in makefile

As a consequence, imported files not needed at runtime will no longer be
packaged.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b3fce99..ab5c464 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ NAME		= luaotfload
 DOCSRCDIR	= ./doc
 SCRIPTSRCDIR	= ./scripts
 SRCSRCDIR	= ./src
-FONTLOADERDIR	= $(SRCSRCDIR)/fontloader
+FONTLOADERDIR	= $(SRCSRCDIR)/fontloader/runtime
 BUILDDIR	= ./build
 MISCDIR		= ./misc
 
-- 
cgit v1.2.3