diff options
author | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-29 15:04:45 -0700 |
---|---|---|
committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-29 15:04:45 -0700 |
commit | 202f064c65283e482f149868437e2881a73ebe3d (patch) | |
tree | b31b5a94146a0a300b3fd09cb50d5736a002f086 /Makefile | |
parent | 5ff06a36a0e82f3350bc955fac3825d7a1969289 (diff) | |
parent | 1e04ecc2c4918448e8ff30a2e6363025267cac79 (diff) | |
download | lualibs-202f064c65283e482f149868437e2881a73ebe3d.tar.gz |
Merge pull request #2 from phi-gamma/master
merge experimental branch
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -8,8 +8,9 @@ MODULES = $(wildcard lualibs-*.lua) # Files grouped by generation mode UNPACKED= lualibs.lua COMPILED = $(DOC_DTX) -GENERATED = $(UNPACKED) $(DOC_DTX) +GENERATED = $(UNPACKED) $(DOC_DTX) $(MERGED) SOURCE = $(DTX) $(MODULES) README Makefile NEWS +MERGED = lualibs-basic-merged.lua lualibs-extended-merged.lua # Files grouped by installation location RUNFILES = $(UNPACKED) $(MODULES) @@ -18,7 +19,7 @@ SRCFILES = $(DTX) $(SRC_TEX) Makefile # The following definitions should be equivalent # ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES) -ALL_FILES = $(GENERATED) $(SOURCE) +ALL_FILES = $(GENERATED) $(SOURCE) $(MERGED) # Installation locations FORMAT = luatex @@ -35,13 +36,15 @@ DO_TEX = tex --interaction=batchmode $< >/dev/null DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null DO_PDFLUALATEX = pdflualatex --interaction=batchmode $< >/dev/null DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1 +DO_PACKAGE = mtxrun --script package --merge $< >/dev/null -all: $(GENERATED) $(DOC_TEX) +all: $(GENERATED) $(DOC_TEX) $(MERGED) doc: $(COMPILED) unpack: $(UNPACKED) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) world: all ctan + .PHONY: all doc unpack ctan tds world %.pdf: %.dtx @@ -50,6 +53,9 @@ world: all ctan $(DO_PDFLATEX) $(DO_PDFLATEX) +%-merged.lua: %.lua + $(DO_PACKAGE) + $(UNPACKED): lualibs.dtx $(DO_TEX) @@ -91,3 +97,4 @@ clean: mrproper: clean @$(RM) -- $(GENERATED) $(ZIPS) +merge: $(MERGED) |