From 8c9d2482d1db3817df7c2ea935c15accd0409cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Fri, 1 May 2009 15:09:37 +0200
Subject: Makefile: adapting CTAN.

---
 Makefile | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 522422c..7cd688d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for luainputenc.
+# Makefile for luaotfload
 
 NAME = luaotfload
 DOC = $(NAME).pdf
@@ -8,12 +8,16 @@ DTX = $(NAME).dtx
 COMPILED = $(DOC)
 UNPACKED = luaotfload.sty luaotfload.lua
 GENERATED = $(COMPILED) $(UNPACKED)
+SOURCE = $(DTX) README Makefile
 
 # Files grouped by installation location
 RUNFILES = $(UNPACKED) $(wildcard otfl-*.lua)
 DOCFILES = $(DOC) README
 SRCFILES = $(DTX) Makefile
-ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
+
+# The following definitions should be equivalent
+# ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
+ALL_FILES = $(GENERATED) $(SOURCE)
 
 # Installation locations
 FORMAT = luatex
@@ -22,16 +26,18 @@ DOCDIR = doc/$(FORMAT)/$(NAME)
 SRCDIR = source/$(FORMAT)/$(NAME)
 ALL_DIRS = $(RUNDIR) $(DOCDIR) $(SRCDIR)
 
-FLAT_ZIP = $(NAME).zip
+CTAN_ZIP = $(NAME).zip
 TDS_ZIP = $(NAME).tds.zip
-CTAN = $(FLAT_ZIP) $(TDS_ZIP)
+ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
 
 DO_TEX = tex --interaction=batchmode $< >/dev/null
 DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
 DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
 
 all: $(GENERATED)
-ctan: $(CTAN)
+ctan: $(CTAN_ZIP)
+doc: $(COMPILED)
+tds: $(TDS_ZIP)
 world: all ctan
 
 $(COMPILED): $(DTX)
@@ -43,13 +49,13 @@ $(COMPILED): $(DTX)
 $(UNPACKED): $(DTX)
 	$(DO_TEX)
 
-$(FLAT_ZIP): $(ALL_FILES)
-	@echo "Making $@ for normal CTAN distribution."
+$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
+	@echo "Making $@ for CTAN upload."
 	@$(RM) -- $@
-	@zip -9 $@ $(ALL_FILES) >/dev/null
+	@zip -9 $@ $^ >/dev/null
 
 $(TDS_ZIP): $(ALL_FILES)
-	@echo "Making $@ for TDS-ready CTAN distribution."
+	@echo "Making TDS-ready archive $@."
 	@$(RM) -- $@
 	@mkdir -p $(ALL_DIRS)
 	@cp $(RUNFILES) $(RUNDIR)
@@ -62,6 +68,6 @@ clean:
 	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg
 
 mrproper: clean
-	@$(RM) -- $(GENERATED) $(CTAN)
+	@$(RM) -- $(GENERATED) $(ZIPS)
 
 .PHONY: clean mrproper
-- 
cgit v1.2.3