Merge tag 'upstream/2.2.3'

Upstream version 2.2.3

1 files changed, 61 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index da5107e..28dea3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,34 @@
-# Makefile for figlet version 2.2.2 (05 July 2005) 
+# Makefile for figlet version 2.2.3 (11 Jan 2011) 
+# adapted from Makefile for figlet version 2.2.2 (05 July 2005) 
 # adapted from Makefile for figlet version 2.2 (15 Oct 1996)
 # Copyright 1993, 1994,1995 Glenn Chappell and Ian Chai
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan
 # Copyright 2002 Christiaan Keet
+# Copyright 2011 Claudio Matsuoka
 
-# Please make sure DESTDIR, MANDIR, DEFAULTFONTDIR and
+# Please notice that to follow modern standards and ease third-party
+# package creation, binaries are now installed under BINDIR, and DESTDIR
+# is reserved for the installation pathname prefix.
+#
+# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and
 #   DEFAULTFONTFILE are defined to reflect the situation
 #   on your computer.  See README for details.
 
 # Don't change this even if your shell is different. The only reason
 # for changing this is if sh is not in the same place.
 SHELL = /bin/sh
-CC = gcc
-CFLAGS = -g
+
+# The C compiler and linker to use
+CC	= gcc
+CFLAGS	= -g -O2 -Wall
+LD	= gcc
+LDFLAGS =
 
 # Where the executables should be put
-DESTDIR = /usr/local/bin
+BINDIR	= /usr/local/bin
 
 # Where the man page should be put
-MANDIR = /usr/local/man/man6
+MANDIR	= /usr/local/man
 
 # Where figlet will search first for fonts (the ".flf" files).
 DEFAULTFONTDIR = /usr/local/share/figlet
@@ -35,28 +45,53 @@ DEFAULTFONTFILE = standard.flf
 ##  END OF CONFIGURATION SECTION
 ##
 
-SOURCES = figlet.c zipio.c crc.c inflate.c
+VERSION	= 2.2.3
+DIST	= figlet-$(VERSION)
+OBJS	= figlet.o zipio.o crc.o inflate.o
+BINS	= figlet chkfont figlist showfigfonts
+MANUAL	= figlet.6 chkfont.6 figlist.6 showfigfonts.6
+DFILES	= Makefile Makefile.tc $(MANUAL) $(OBJS:.o=.c) chkfont.c \
+	  figlist showfigfonts CHANGES FAQ README LICENSE figfont.txt \
+	  crc.h inflate.h zipio.h
+
+.c.o:
+	$(CC) -c $(CFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \
+		-DDEFAULTFONTFILE=\"$(DEFAULTFONTFILE)\" -o $*.o $<
 
-all: figlet chkfont
+all: $(BINS)
 
-figlet: $(SOURCES)
-	$(CC) $(CFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \
-	   -DDEFAULTFONTFILE=\"$(DEFAULTFONTFILE)\" \
-	   $(SOURCES) -o figlet
-	chmod a+x figlet
+figlet: $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS)
 
-chkfont: chkfont.c
-	$(CC) $(CFLAGS) -o chkfont chkfont.c
+chkfont: chkfont.o
+	$(LD) $(LDFLAGS) -o $@ chkfont.o
 
 clean:
-	rm -f *.o figlet chkfont
-
-install: figlet chkfont
-	mkdir -p $(DEFAULTFONTDIR)
-	cp figlet $(DESTDIR)
-	cp figlet.6 $(MANDIR)
-	cp chkfont $(DESTDIR)
-	cp figlist $(DESTDIR)
-	cp showfigfonts $(DESTDIR)
-	cp fonts/*.flf $(DEFAULTFONTDIR)
-	cp fonts/*.flc $(DEFAULTFONTDIR)
+	rm -f *.o *~ core figlet chkfont
+
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man6
+	mkdir -p $(DESTDIR)$(DEFAULTFONTDIR)
+	cp $(BINS) $(DESTDIR)$(BINDIR)
+	cp $(MANUAL) $(DESTDIR)$(MANDIR)/man6
+	cp fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
+	cp fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
+
+dist:
+	rm -Rf $(DIST) $(DIST).tar.gz
+	mkdir $(DIST)/
+	cp $(DFILES) $(DIST)/
+	mkdir $(DIST)/fonts
+	cp fonts/*.fl[fc] $(DIST)/fonts
+	tar cvf - $(DIST) | gzip -9c > $(DIST).tar.gz
+	rm -Rf $(DIST)
+	ls -l $(DIST).tar.gz
+
+$(OBJS) chkfont.o getopt.o: Makefile
+chkfont.o: chkfont.c
+crc.o: crc.c crc.h
+figlet.o: figlet.c zipio.h
+getopt.o: getopt.c
+inflate.o: inflate.c inflate.h
+zipio.o: zipio.c zipio.h inflate.h crc.h