Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Oct 2015 21:38:58 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r289471 - in user/ngie/bug203673: bin/df bin/ls bin/ps lib/libxo lib/libxo/tests lib/libxo/tests/encoder libexec/ftpd sbin/savecore share/mk usr.bin/iscsictl usr.bin/netstat usr.bin/pro...
Message-ID:  <201510172138.t9HLcwiF095174@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sat Oct 17 21:38:57 2015
New Revision: 289471
URL: https://svnweb.freebsd.org/changeset/base/289471

Log:
  Changes for bug 203673 (under test)

Modified:
  user/ngie/bug203673/bin/df/Makefile
  user/ngie/bug203673/bin/ls/Makefile
  user/ngie/bug203673/bin/ps/Makefile
  user/ngie/bug203673/lib/libxo/Makefile
  user/ngie/bug203673/lib/libxo/tests/Makefile
  user/ngie/bug203673/lib/libxo/tests/encoder/Makefile
  user/ngie/bug203673/libexec/ftpd/Makefile
  user/ngie/bug203673/sbin/savecore/Makefile
  user/ngie/bug203673/share/mk/src.libnames.mk
  user/ngie/bug203673/usr.bin/iscsictl/Makefile
  user/ngie/bug203673/usr.bin/netstat/Makefile
  user/ngie/bug203673/usr.bin/procstat/Makefile
  user/ngie/bug203673/usr.bin/w/Makefile
  user/ngie/bug203673/usr.bin/wc/Makefile
  user/ngie/bug203673/usr.bin/xo/Makefile

Modified: user/ngie/bug203673/bin/df/Makefile
==============================================================================
--- user/ngie/bug203673/bin/df/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/bin/df/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -9,6 +9,6 @@ SRCS=	df.c vfslist.c
 
 CFLAGS+= -I${MOUNT}
 
-LIBADD=	xo util
+LIBADD=	xo
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/bin/ls/Makefile
==============================================================================
--- user/ngie/bug203673/bin/ls/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/bin/ls/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -5,7 +5,7 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	xo util
+LIBADD=	util xo
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no

Modified: user/ngie/bug203673/bin/ps/Makefile
==============================================================================
--- user/ngie/bug203673/bin/ps/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/bin/ps/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -11,6 +11,6 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-LIBADD=	m kvm jail xo util
+LIBADD=	m kvm jail xo
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/lib/libxo/Makefile
==============================================================================
--- user/ngie/bug203673/lib/libxo/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/lib/libxo/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -19,6 +19,8 @@ CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo
 INCS=	xo.h xo_encoder.h
 INCSDIR=${INCLUDEDIR}/libxo
 
+LIBADD=	util
+
 WARNS?= 5
 
 MAN+=	libxo.3

Modified: user/ngie/bug203673/lib/libxo/tests/Makefile
==============================================================================
--- user/ngie/bug203673/lib/libxo/tests/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/lib/libxo/tests/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -242,8 +242,7 @@ PROGS+= test_11
 
 CFLAGS+=	-I${LIBXOSRC}/libxo
 
-DPADD=		${LIBXO} ${LIBUTIL}
-LDADD=		-lxo -lutil
+LIBADD=		xo
 
 SUBDIR+=	encoder
 

Modified: user/ngie/bug203673/lib/libxo/tests/encoder/Makefile
==============================================================================
--- user/ngie/bug203673/lib/libxo/tests/encoder/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/lib/libxo/tests/encoder/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -14,7 +14,6 @@ SRCS=		enc_test.c
 
 CFLAGS+=	-I${LIBXOSRC}/libxo
 
-DPADD+=		${LIBXO}
-LDADD+=		-lxo
+LIBADD=		xo
 
 .include <bsd.lib.mk>

Modified: user/ngie/bug203673/libexec/ftpd/Makefile
==============================================================================
--- user/ngie/bug203673/libexec/ftpd/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/libexec/ftpd/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -13,7 +13,7 @@ YFLAGS=
 WARNS?=	2
 WFORMAT=0
 
-LIBADD=	crypt xo util
+LIBADD=	crypt xo
 
 # XXX Kluge! Conversation mechanism needs to be fixed.
 LIBADD+=	opie md

Modified: user/ngie/bug203673/sbin/savecore/Makefile
==============================================================================
--- user/ngie/bug203673/sbin/savecore/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/sbin/savecore/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	savecore
-LIBADD=	z xo util
+LIBADD=	z xo
 MAN=	savecore.8
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/share/mk/src.libnames.mk
==============================================================================
--- user/ngie/bug203673/share/mk/src.libnames.mk	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/share/mk/src.libnames.mk	Sat Oct 17 21:38:57 2015	(r289471)
@@ -239,6 +239,7 @@ _DP_vmmapi=	util
 _DP_ctf=	z
 _DP_proc=	rtld_db util
 _DP_dtrace=	rtld_db pthread
+_DP_xo=		util
 
 # Define spacial cases
 LDADD_supcplusplus=	-lsupc++

Modified: user/ngie/bug203673/usr.bin/iscsictl/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/iscsictl/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/iscsictl/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -6,7 +6,7 @@ CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/../../sys/dev/iscsi
 MAN=		iscsi.conf.5 iscsictl.8
 
-LIBADD=		xo util
+LIBADD=		xo
 
 YFLAGS+=	-v
 LFLAGS+=	-i

Modified: user/ngie/bug203673/usr.bin/netstat/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/netstat/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/netstat/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -56,7 +56,7 @@ CFLAGS+=-DPF
 
 BINGRP=	kmem
 BINMODE=2555
-LIBADD=	kvm memstat xo util
+LIBADD=	kvm memstat xo
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c

Modified: user/ngie/bug203673/usr.bin/procstat/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/procstat/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/procstat/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -17,6 +17,6 @@ SRCS=	procstat.c		\
 	procstat_threads.c	\
 	procstat_vm.c
 
-LIBADD+=	procstat xo util sbuf
+LIBADD+=	procstat xo sbuf
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/usr.bin/w/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/w/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/w/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -4,7 +4,7 @@
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
 MAN=	w.1 uptime.1
-LIBADD=	kvm sbuf xo util
+LIBADD=	kvm sbuf xo
 LINKS=	${BINDIR}/w ${BINDIR}/uptime
 
 .PATH: ${.CURDIR}/../../bin/ps

Modified: user/ngie/bug203673/usr.bin/wc/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/wc/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/wc/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -2,6 +2,6 @@
 # $FreeBSD$
 
 PROG=	wc
-LIBADD=	xo util
+LIBADD=	xo
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/usr.bin/xo/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/xo/Makefile	Sat Oct 17 21:37:16 2015	(r289470)
+++ user/ngie/bug203673/usr.bin/xo/Makefile	Sat Oct 17 21:38:57 2015	(r289471)
@@ -12,7 +12,7 @@ MAN=	xo.1
 # XXX For xoversion.h
 CFLAGS+=-I${LIBXOSRC}/libxo
 
-LIBADD=	xo util
+LIBADD=	xo
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510172138.t9HLcwiF095174>