From owner-svn-src-head@FreeBSD.ORG  Sat Nov 22 20:48:22 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C2FF4218;
 Sat, 22 Nov 2014 20:48:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF9A8143;
 Sat, 22 Nov 2014 20:48:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMKmMIK090953;
 Sat, 22 Nov 2014 20:48:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMKmM7x090951;
 Sat, 22 Nov 2014 20:48:22 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201411222048.sAMKmM7x090951@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 22 Nov 2014 20:48:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274891 - in head: lib/libmandoc usr.bin/mandoc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Nov 2014 20:48:22 -0000

Author: bapt
Date: Sat Nov 22 20:48:21 2014
New Revision: 274891
URL: https://svnweb.freebsd.org/changeset/base/274891

Log:
  Rework mandoc Makefile to ease maintainance
  Add compat_reallocarray into libmandoc given other mandoc components will use
  it.

Modified:
  head/lib/libmandoc/Makefile
  head/usr.bin/mandoc/Makefile

Modified: head/lib/libmandoc/Makefile
==============================================================================
--- head/lib/libmandoc/Makefile	Sat Nov 22 20:42:32 2014	(r274890)
+++ head/lib/libmandoc/Makefile	Sat Nov 22 20:48:21 2014	(r274891)
@@ -27,9 +27,11 @@ LIBROFF_SRCS=	eqn.c \
 		tbl_data.c \
 		tbl_layout.c \
 		tbl_opts.c
+COMPAT_SRCS=	compat_reallocarray.c
 SRCS=		${LIBMAN_SRCS} \
 		${LIBMDOC_SRCS} \
 		${LIBROFF_SRCS} \
+		${COMPAT_SRCS} \
 		chars.c \
 		mandoc.c \
 		mandoc_aux.c \

Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile	Sat Nov 22 20:42:32 2014	(r274890)
+++ head/usr.bin/mandoc/Makefile	Sat Nov 22 20:48:21 2014	(r274891)
@@ -10,11 +10,26 @@ FILESDIR=	${SHAREDIR}/mdocml
 LINKS=	mdocml
 MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 # man.7 mdoc.7 roff.7
 MLINKS= mandoc.1 mdocml.1
-SRCS=	main.c mdoc_term.c chars.c term.c tree.c man_term.c eqn_term.c \
-	mdoc_man.c
-SRCS+=	html.c mdoc_html.c man_html.c out.c eqn_html.c
-SRCS+=	term_ps.c term_ascii.c tbl_term.c tbl_html.c
-SRCS+=	manpath.c compat_reallocarray.c
+
+HTML_SRCS=	eqn_html.c \
+		html.c \
+		man_html.c \
+		mdoc_html.c \
+		tbl_html.c
+MAN_SRCS=	mdoc_man.c
+TERM_SRCS=	eqn_term.c \
+		man_term.c \
+		mdoc_term.c \
+		term.c \
+		term_ascii.c \
+		term_ps.c \
+		tbl_term.c
+SRCS=		${HTML_SRCS} \
+		${MAN_SRCS} \
+		${TERM_SRCS} \
+		main.c \
+		out.c \
+		tree.c
 
 WARNS?=	3
 CFLAGS+= -DHAVE_CONFIG_H