Module Name: src
Committed By: kre
Date: Thu Aug 16 05:03:17 UTC 2018
Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
Log Message:
mandoc needs mandoc_xr.c and (because we do not have it in libc, which
should remain the state forever IMO) compat_recallocarray.c
And now that compat_recallocarray() is in libmandoc we no longer
need to manually add its source to mandoc (either the full, or the
tools builds).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/mdocml/lib/libmandoc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.15 src/external/bsd/mdocml/bin/mandoc/Makefile:1.16
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.15 Thu Aug 16 03:59:52 2018
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Thu Aug 16 05:03:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/08/16 03:59:52 kre Exp $
+# $NetBSD: Makefile,v 1.16 2018/08/16 05:03:17 kre Exp $
.include <bsd.own.mk>
@@ -31,12 +31,10 @@ tree.c
DPADD+= ${MDOCMLLIB.mandoc} ${LIBZ}
LDADD+= -L${MDOCMLOBJDIR.mandoc} -lmandoc -lz
CPPFLAGS+= -DUSE_WCHAR
-SRCS+= compat_recallocarray.c
.else
SRCS.libmandoc!=cd ${.PARSEDIR}/../../lib/libmandoc && ${MAKE} -v SRCS
-SRCS+= ${SRCS.libmandoc} compat_strtonum.c compat_reallocarray.c \
- compat_recallocarray.c
+SRCS+= ${SRCS.libmandoc} compat_strtonum.c compat_reallocarray.c
.endif
COPTS.man_term.c+= -Wno-error=array-bounds
Index: src/external/bsd/mdocml/lib/libmandoc/Makefile
diff -u src/external/bsd/mdocml/lib/libmandoc/Makefile:1.10 src/external/bsd/mdocml/lib/libmandoc/Makefile:1.11
--- src/external/bsd/mdocml/lib/libmandoc/Makefile:1.10 Thu Aug 16 01:08:18 2018
+++ src/external/bsd/mdocml/lib/libmandoc/Makefile Thu Aug 16 05:03:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/08/16 01:08:18 kre Exp $
+# $NetBSD: Makefile,v 1.11 2018/08/16 05:03:17 kre Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,7 @@ SRCS= \
att.c \
chars.c \
compat_ohash.c \
+compat_recallocarray.c \
eqn.c \
lib.c \
man.c \
@@ -15,6 +16,7 @@ man_validate.c \
mandoc.c \
mandoc_aux.c \
mandoc_ohash.c \
+mandoc_xr.c \
mdoc.c \
mdoc_argv.c \
mdoc_macro.c \
