svn commit: r281384 - in head: share/mk usr.sbin/fifolog/fifolog_reader usr.sbin/fifolog/fifolog_writer

[Ed Maste]

Author: emaste
Date: Fri Apr 10 21:24:38 2015
New Revision: 281384
URL: https://svnweb.freebsd.org/changeset/base/281384

Log:
  Fix libfifolog dependency on libz
  
  Consumers should not need to encode fifolog's dependency on libz.
  Handle it automatically in src.libnames.mk.
  
  Differential Revision:	https://reviews.freebsd.org/D2278
  Reviewed by:	bapt
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/src.libnames.mk
  head/usr.sbin/fifolog/fifolog_reader/Makefile
  head/usr.sbin/fifolog/fifolog_writer/Makefile

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Fri Apr 10 20:55:17 2015	(r281383)
+++ head/share/mk/src.libnames.mk	Fri Apr 10 21:24:38 2015	(r281384)
@@ -259,6 +259,9 @@ LDADD_sqlite3+=	${LDADD_pthread}
 DPADD_atf_cxx+=	${DPADD_atf_c}
 LDADD_atf_cxx+=	${LDADD_atf_c}
 
+DPADD_fifolog+=	${DPADD_z}
+LDADD_fifolog+=	${LDADD_z}
+
 DPADD_ipf+=	${DPADD_kvm}
 LDADD_ipf+=	${LDADD_kvm}
 

Modified: head/usr.sbin/fifolog/fifolog_reader/Makefile
==============================================================================
--- head/usr.sbin/fifolog/fifolog_reader/Makefile	Fri Apr 10 20:55:17 2015	(r281383)
+++ head/usr.sbin/fifolog/fifolog_reader/Makefile	Fri Apr 10 21:24:38 2015	(r281384)
@@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib
 
 MAN=
 
-LIBADD=	z fifolog
+LIBADD=	fifolog
 
 regress:
 	./${PROG} /tmp/fifolog.0

Modified: head/usr.sbin/fifolog/fifolog_writer/Makefile
==============================================================================
--- head/usr.sbin/fifolog/fifolog_writer/Makefile	Fri Apr 10 20:55:17 2015	(r281383)
+++ head/usr.sbin/fifolog/fifolog_writer/Makefile	Fri Apr 10 21:24:38 2015	(r281384)
@@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib
 
 MAN=
 
-LIBADD=	z fifolog
+LIBADD=	fifolog
 
 regress:
 	date | ./${PROG} -z 0 /tmp/fifolog.0