From owner-svn-src-head@FreeBSD.ORG  Wed Aug  6 22:46:16 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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C9F20C64
 for <svn-src-head@freebsd.org>; Wed,  6 Aug 2014 22:46:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A02CA2589
 for <svn-src-head@freebsd.org>; Wed,  6 Aug 2014 22:46:16 +0000 (UTC)
Received: from bapt (uid 1235) (envelope-from bapt@FreeBSD.org) id 5e44
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 22:46:15 +0000
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 6 Aug 2014 22:46:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269649 - in head: lib lib/libohash share/mk usr.bin/m4
 usr.bin/m4/lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e2b038.5e44.59dbd637@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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: Wed, 06 Aug 2014 22:46:16 -0000

Author: bapt
Date: Wed Aug  6 22:46:15 2014
New Revision: 269649
URL: http://svnweb.freebsd.org/changeset/base/269649

Log:
  Make libohash a proper internallib instead of hidding it in m4
  
  mandoc development seems to be also using ohash so prepare to share the code when
  needed

Added:
  head/lib/libohash/
     - copied from r269624, head/usr.bin/m4/lib/
  head/lib/libohash/Makefile   (contents, props changed)
Deleted:
  head/usr.bin/m4/lib/
Modified:
  head/lib/Makefile
  head/share/mk/src.libnames.mk
  head/usr.bin/m4/Makefile

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Wed Aug  6 22:17:26 2014	(r269648)
+++ head/lib/Makefile	Wed Aug  6 22:46:15 2014	(r269649)
@@ -69,6 +69,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libnetgraph} \
 	${_libngatm} \
 	libnv \
+	libohash \
 	libopie \
 	libpam \
 	libpcap \

Added: head/lib/libohash/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libohash/Makefile	Wed Aug  6 22:46:15 2014	(r269649)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+LIB=	ohash
+SRCS=	ohash.c
+INTERNALLIB=
+
+WARNS=	3
+
+.include <bsd.lib.mk>

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Wed Aug  6 22:17:26 2014	(r269648)
+++ head/share/mk/src.libnames.mk	Wed Aug  6 22:46:15 2014	(r269649)
@@ -44,3 +44,7 @@ LIBUCL?=	${LIBUCLDIR}/libucl.a
 LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
 LDREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
+
+LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
+LDOHASH?=	${LIBOHASHDIR}/libohash.a
+LIBOHASH?=	${LIBOHASHDIR}/libohash.a

Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile	Wed Aug  6 22:17:26 2014	(r269648)
+++ head/usr.bin/m4/Makefile	Wed Aug  6 22:46:15 2014	(r269649)
@@ -7,16 +7,13 @@
 .include <src.opts.mk>
 
 PROG=	m4
-CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
-DPADD=	${LIBY} ${LIBL} ${LIBM}
-LDADD=	-ly -ll -lm
+CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
+DPADD=	${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
+LDADD=	-ly -ll -lm ${LDOHASH}
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l
-.PATH: ${.CURDIR}/lib
-SRCS+=	ohash.c
-WARNS=	3
 
 tokenizer.o: parser.h