Various Makefile improvements:

* Use sha256 rather than md5.
* Update .h dependencies for some objects.
* Provide `www' target to build everything needed for the web site.
* Move .SUFFIXES and .PHONY technicalities to the bottom.
* State Copyright and license, just for clarity.

diff --git a/Makefile b/Makefile
index 57f3ce7f635ee36597d842e80965ffa4e060916c..2bf6340186218c8d2b64fbb5bbf86c22ca7a7405 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,19 @@
-.PHONY:         clean install installcgi installwww
-.SUFFIXES:      .md5 .h .h.html
-.SUFFIXES:      .1       .3       .5       .7       .8
-.SUFFIXES:      .1.html  .3.html  .5.html  .7.html  .8.html
+# $Id: Makefile,v 1.419 2014/04/24 00:29:45 schwarze Exp $
+#
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 
 VERSION                 = 1.13.0
 
 
 VERSION                 = 1.13.0
 


@@ -10,7 +22,7 @@ VERSION                = 1.13.0
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 #
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 #

-# CFLAGS       += -DOSNAME="\"OpenBSD 5.4\""
+# CFLAGS       += -DOSNAME="\"OpenBSD 5.5\""

 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a


@@ -222,6 +234,8 @@ COMPAT_OBJS  = compat_fgetln.o \
                   compat_strnlen.o \
                   compat_strsep.o
 
                   compat_strnlen.o \
                   compat_strsep.o
 

+# === DEPENDENCY HANDLING ==============================================
+

 arch.o: arch.in
 att.o: att.in
 chars.o: chars.in
 arch.o: arch.in
 att.o: att.in
 chars.o: chars.in


@@ -271,13 +285,13 @@ PRECONV_OBJS       = preconv.o
 $(PRECONV_OBJS): config.h
 
 APROPOS_OBJS    = apropos.o mansearch.o mansearch_const.o manpath.o
 $(PRECONV_OBJS): config.h
 
 APROPOS_OBJS    = apropos.o mansearch.o mansearch_const.o manpath.o

-$(APROPOS_OBJS): config.h manpath.h mansearch.h
+$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h

 
 MANPAGE_OBJS    = manpage.o mansearch.o mansearch_const.o manpath.o
 
 MANPAGE_OBJS    = manpage.o mansearch.o mansearch_const.o manpath.o

-$(MANPAGE_OBJS): config.h manpath.h mansearch.h
+$(MANPAGE_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h

 
 DEMANDOC_OBJS   = demandoc.o
 
 DEMANDOC_OBJS   = demandoc.o

-$(DEMANDOC_OBJS): config.h
+$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h

 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \


@@ -296,14 +310,17 @@ WWW_MANS   = apropos.1.html \
                   makewhatis.8.html \
                   man.h.html \
                   mandoc.h.html \
                   makewhatis.8.html \
                   man.h.html \
                   mandoc.h.html \

+                  mandoc_aux.h.html \

                   manpath.h.html \
                   mansearch.h.html \
                   mdoc.h.html
 
                   manpath.h.html \
                   mansearch.h.html \
                   mdoc.h.html
 

-$(WWW_MANS): mandoc
-

 WWW_OBJS        = mdocml.tar.gz \
 WWW_OBJS        = mdocml.tar.gz \

-                  mdocml.md5
+                  mdocml.sha256
+
+www: $(WWW_OBJS) $(WWW_MANS)
+
+# === TARGETS CONTAINING SHELL COMMANDS ================================

 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)


@@ -332,7 +349,8 @@ install: all
        $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
        $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5

-       $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \
+               $(DESTDIR)$(MANDIR)/man7

        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 installcgi: all
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 installcgi: all


@@ -342,14 +360,14 @@ installcgi: all
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
        $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
        $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 

-installwww: $(WWW_MANS) $(WWW_OBJS)
+installwww: www

        mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) mdocml.tar.gz \
                $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
        mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) mdocml.tar.gz \
                $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz

-       $(INSTALL_DATA) mdocml.md5 \
-               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).md5
+       $(INSTALL_DATA) mdocml.sha256 \
+               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256

 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)


@@ -372,8 +390,8 @@ apropos: $(APROPOS_OBJS) libmandoc.a
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 

-mdocml.md5: mdocml.tar.gz
-       md5 mdocml.tar.gz >$@
+mdocml.sha256: mdocml.tar.gz
+       sha256 mdocml.tar.gz > $@

 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/
 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/


@@ -386,8 +404,13 @@ config.h: configure config.h.pre config.h.post $(TESTSRCS)
        rm -f config.log
        CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
        rm -f config.log
        CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 

+.PHONY:         clean install installcgi installwww
+.SUFFIXES:      .1       .3       .5       .7       .8       .h
+.SUFFIXES:      .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
+

 .h.h.html:
 .h.h.html:

-       highlight -I $< >$@
+       highlight -I $< > $@

 
 

-.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
-       ./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
+       ./mandoc -Thtml -Wall,stop \
+               -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@