suboptarg is not portable to Linux (fixed).

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 1146412b0cfe7d705da2a4a2cfb06c745fe8e8ec..8e8d3cb0abf9a6beffbc136c4330c924b30cf5f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES:     .html .sgml .1.txt .3.txt .7.txt .1 .3 .7
+.SUFFIXES:     .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
@@ -9,30 +9,31 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.12
-VDATE     = 06 April 2009
+VERSION           = 1.7.20
+VDATE     = 22 June 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
-LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
+LINTFLAGS += $(VFLAGS)
 
 MDOCLNS           = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
             mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
-            lib.ln att.ln arch.ln vol.ln msec.ln st.ln
+            lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
+            mandoc.ln
 MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
             mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
-            arch.o vol.o msec.o st.o
+            arch.o vol.o msec.o st.o mandoc.o
 MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
             mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
-            arch.c vol.c msec.c st.c
+            arch.c vol.c msec.c st.c mandoc.c
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \
-            man_action.ln
+            man_action.ln mandoc.ln
 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \
-            man_action.o
+            man_action.o mandoc.o
 MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \
-            man_action.c
+            man_action.c mandoc.c
 
 MAINLNS           = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
             compat.ln man_term.ln
@@ -47,10 +48,14 @@ LIBS           = libmdoc.a libman.a
 OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in
-HEADS     = mdoc.h libmdoc.h man.h libman.h term.h 
+HEADS     = mdoc.h libmdoc.h man.h libman.h term.h libmandoc.h
 SGMLS     = index.sgml 
 HTMLS     = index.html
 STATICS           = style.css external.png
+MD5S      = mdocml-$(VERSION).md5 \
+            mdocml-oport-$(VERSION).md5 \
+            mdocml-fport-$(VERSION).md5 \
+            mdocml-nport-$(VERSION).md5
 TARGZS    = mdocml-$(VERSION).tar.gz \
             mdocml-oport-$(VERSION).tar.gz \
             mdocml-fport-$(VERSION).tar.gz \
@@ -61,7 +66,7 @@ TEXTS    = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
             mandoc_char.7.txt man.7.txt man.3.txt
 BINS      = mandoc
 CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-            $(TARGZS) tags $(TEXTS)
+            $(TARGZS) tags $(TEXTS) ChangeLog $(MD5S)
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
             Makefile
 INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -79,22 +84,29 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
-port:  mdocml-oport-$(VERSION).tar.gz \
-       mdocml-fport-$(VERSION).tar.gz \
-       mdocml-nport-$(VERSION).tar.gz
+html:  $(HTMLS)
 
-www:   all $(HTMLS) $(TARGZS) $(TEXTS)
+www:   all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) ChangeLog
 
 installwww: www
        install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
+       install -m 0444 ChangeLog $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
        install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
        install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+       install -m 0444 mdocml-oport-$(VERSION).md5 $(PREFIX)/ports-openbsd/
+       install -m 0444 mdocml-oport-$(VERSION).md5 $(PREFIX)/ports-openbsd/mdocml.md5
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
+       install -m 0444 mdocml-nport-$(VERSION).md5 $(PREFIX)/ports-netbsd/
+       install -m 0444 mdocml-nport-$(VERSION).md5 $(PREFIX)/ports-netbsd/mdocml.md5
        install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/
        install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/mdocml.tar.gz
+       install -m 0444 mdocml-fport-$(VERSION).md5 $(PREFIX)/ports-freebsd/
+       install -m 0444 mdocml-fport-$(VERSION).md5 $(PREFIX)/ports-freebsd/mdocml.md5
 
 install:
        mkdir -p $(BINDIR)
@@ -157,6 +169,9 @@ man.o: man.c libman.h
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
+compat.ln: compat.c 
+compat.o: compat.c
+
 term.ln: term.c term.h man.h mdoc.h
 term.o: term.c term.h man.h mdoc.h
 
@@ -174,6 +189,9 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
+ChangeLog::
+       cvs2cl -P -t --no-indent --FSF --no-times
+
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
        mkdir -p .dist/mdocml/
        sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
@@ -225,13 +243,13 @@ mdocml-$(VERSION).tar.gz: $(INSTALL)
        rm -rf .dist/
 
 llib-llibmdoc.ln: $(MDOCLNS)
-       $(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS)
+       $(LINT) -Clibmdoc $(MDOCLNS)
 
 llib-llibman.ln: $(MANLNS)
-       $(LINT) $(LINTFLAGS) -Clibman $(MANLNS)
+       $(LINT) -Clibman $(MANLNS)
 
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-       $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+       $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
 libmdoc.a: $(MDOCOBJS)
        $(AR) rs $@ $(MDOCOBJS)
@@ -247,10 +265,13 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .3.3.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .7.7.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.tar.gz.md5:
+       md5 $< > $@