-# $Id: Makefile,v 1.509 2017/04/29 12:45:41 schwarze Exp $
+# $Id: Makefile,v 1.520 2018/08/09 17:28:23 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013-2018 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
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-VERSION = 1.14.1
+VERSION = 1.14.4
# === LIST OF FILES ====================================================
test-isblank.c \
test-mkdtemp.c \
test-nanosleep.c \
+ test-noop.c \
test-ntohl.c \
test-O_DIRECTORY.c \
test-ohash.c \
test-progname.c \
test-recvmsg.c \
test-reallocarray.c \
+ test-recallocarray.c \
test-rewb-bsd.c \
test-rewb-sysv.c \
test-sandbox_init.c \
test-stringlist.c \
test-strlcat.c \
test-strlcpy.c \
+ test-strndup.c \
test-strptime.c \
test-strsep.c \
test-strtonum.c \
compat_ohash.c \
compat_progname.c \
compat_reallocarray.c \
+ compat_recallocarray.c \
compat_strcasestr.c \
compat_stringlist.c \
compat_strlcat.c \
compat_strlcpy.c \
+ compat_strndup.c \
compat_strsep.c \
compat_strtonum.c \
compat_vasprintf.c \
mandoc.c \
mandoc_aux.c \
mandoc_ohash.c \
+ mandoc_xr.c \
mandocd.c \
mandocdb.c \
manpath.c \
preconv.c \
read.c \
roff.c \
+ roff_html.c \
+ roff_term.c \
+ roff_validate.c \
soelim.c \
st.c \
tag.c \
term.c \
term_ascii.c \
term_ps.c \
+ term_tab.c \
tree.c
DISTFILES = INSTALL \
mandoc_html.3 \
mandoc_malloc.3 \
mandoc_ohash.h \
+ mandoc_xr.h \
mandocd.8 \
mansearch.3 \
mansearch.h \
LIBROFF_OBJS = eqn.o \
roff.o \
+ roff_validate.o \
tbl.o \
tbl_data.o \
tbl_layout.o \
mandoc.o \
mandoc_aux.o \
mandoc_ohash.o \
+ mandoc_xr.o \
msec.o \
preconv.o \
read.o
compat_ohash.o \
compat_progname.o \
compat_reallocarray.o \
+ compat_recallocarray.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
+ compat_strndup.o \
compat_strsep.o \
compat_strtonum.o \
compat_vasprintf.o
html.o \
man_html.o \
mdoc_html.o \
+ roff_html.o \
tbl_html.o
MANDOC_TERM_OBJS = eqn_term.o \
man_term.o \
mdoc_term.o \
+ roff_term.o \
term.o \
term_ascii.o \
term_ps.o \
+ term_tab.o \
tbl_term.o
DBM_OBJS = dbm.o \
WWW_MANS = apropos.1.html \
demandoc.1.html \
man.1.html \
+ man.options.1.html \
mandoc.1.html \
soelim.1.html \
man.cgi.3.html \
eqn.7.html \
man.7.html \
mandoc_char.7.html \
- mandocd.8.html \
mdoc.7.html \
roff.7.html \
tbl.7.html \
catman.8.html \
makewhatis.8.html \
man.cgi.8.html \
- man.h.html \
+ mandocd.8.html
+
+WWW_INCS = man.h.html \
manconf.h.html \
mandoc.h.html \
mandoc_aux.h.html \
mdoc.h.html \
roff.h.html
-WWW_OBJS = mdocml.tar.gz \
- mdocml.sha256
-
# === USER CONFIGURATION ===============================================
include Makefile.local
install: base-install $(INSTALL_TARGETS)
-www: $(WWW_OBJS) $(WWW_MANS)
+www: $(WWW_MANS) $(WWW_INCS)
-$(WWW_MANS): mandoc
+$(WWW_MANS) $(WWW_INCS): mandoc
.PHONY: base-install cgi-install install www-install
.PHONY: clean distclean depend
rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
rm -f mandoc $(MAIN_OBJS)
rm -f man.cgi $(CGI_OBJS)
- rm -f mandocd catman $(MANDOCD_OBJS)
+ rm -f mandocd catman catman.o $(MANDOCD_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
rm -f soelim $(SOELIM_OBJS)
- rm -f $(WWW_MANS) $(WWW_OBJS)
+ rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
rm -rf *.dSYM
base-install: mandoc demandoc soelim
# --- maintainer targets ---
www-install: www
- mkdir -p $(HTDOCDIR)/snapshots
- $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
- $(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots
- $(INSTALL_DATA) mdocml.tar.gz \
- $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
- $(INSTALL_DATA) mdocml.sha256 \
- $(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
+ $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+ $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+ $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
depend: config.h
mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
! -name '*.out_ascii' \
! -name '*.out_utf8' \
! -name '*.out_html' \
+ ! -name '*.out_markdown' \
! -name '*.out_lint' \
! -path regress/regress.pl \
! -path regress/regress.pl.1
-dist: mdocml.sha256
+dist: mandoc-$(VERSION).sha256
-mdocml.sha256: mdocml.tar.gz
- sha256 mdocml.tar.gz > $@
+mandoc-$(VERSION).sha256: mandoc-$(VERSION).tar.gz
+ sha256 mandoc-$(VERSION).tar.gz > $@
-mdocml.tar.gz: $(DISTFILES)
+mandoc-$(VERSION).tar.gz: $(DISTFILES)
ls regress/*/*/*.mandoc_* && exit 1 || true
- mkdir -p .dist/mdocml-$(VERSION)/
- $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
- cp -pR regress .dist/mdocml-$(VERSION)
- find .dist/mdocml-$(VERSION)/regress \
+ mkdir -p .dist/mandoc-$(VERSION)/
+ $(INSTALL) -m 0644 $(DISTFILES) .dist/mandoc-$(VERSION)
+ cp -pR regress .dist/mandoc-$(VERSION)
+ find .dist/mandoc-$(VERSION)/regress \
-type d -name CVS -print0 | xargs -0 rm -rf
- chmod 755 .dist/mdocml-$(VERSION)/configure
- ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
+ chmod 755 .dist/mandoc-$(VERSION)/configure
+ ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
rm -rf .dist/
# === SUFFIX RULES =====================================================
highlight -I $< > $@
.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
- ./mandoc -Thtml -Wall,stop \
- -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
+ ./mandoc -Thtml -O \
+ style=/mandoc.css,man=/man/%N.%S.html,includes=/includes/%I.html \
+ $< > $@
git.ckatri.com / mandoc.git / blobdiff