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).
This commit is contained in:
parent
2581e35471
commit
a0734df14c
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue