Moved flags_to_string and string_to_flags into libutil. It's used in

many places nowadays.

9 files changed, 22 insertions, 16 deletions

diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index d05ff81..d96c99c 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -1,10 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 NOSHARED?=yes
 
 PROG=	chflags
 CFLAGS+=-Wall
-SRCS=	chflags.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
+SRCS=	chflags.c
+LDADD=	-lutil
 
 .include <bsd.prog.mk>
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index fe40df1..bf43369 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,7 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
+
 PROG=	ls
-SRCS=	cmp.c stat_flags.c ls.c print.c util.c
+SRCS=	cmp.c ls.c print.c util.c
+LDADD=	-lutil
 
 .include <bsd.prog.mk>
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index dcdae17..e2811f4 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PROG=	rm
-SRCS=   rm.c stat_flags.c
+SRCS=   rm.c
+LDADD=	-lutil
 
 LINKS=	${BINDIR}/rm ${BINDIR}/unlink
 MLINKS=	rm.1 unlink.1
 
-.PATH: ${.CURDIR}/../ls
-
 .include <bsd.prog.mk>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index e06f227..772fc7f 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -7,7 +7,8 @@ SHLIB_MINOR= 2
 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../../sys
 SRCS=	login.c login_tty.c logout.c logwtmp.c pty.c setproctitle.c \
 	login_cap.c login_class.c login_auth.c login_times.c login_ok.c \
-	_secure_path.c uucplock.c property.c auth.c realhostname.c fparseln.c
+	_secure_path.c uucplock.c property.c auth.c realhostname.c fparseln.c \
+	stat_flags.c
 MAN3+=	login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
 	setproctitle.3 login_cap.3 login_class.3 login_times.3 login_ok.3 \
 	_secure_path.3 uucplock.3 property.3 auth.3 realhostname.3 \
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index ad5d142..c23e85b 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -14,7 +14,7 @@ DPADD=	${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL}
 
 LSDIR=	../../bin/ls
 .PATH:	${.CURDIR}/${LSDIR}
-SRCS+=	ls.c cmp.c print.c stat_flags.c util.c
+SRCS+=	ls.c cmp.c print.c util.c
 CFLAGS+=-DINTERNAL_LS -Dmain=ls_main -I${.CURDIR}/${LSDIR}
 
 .if defined(NOPAM)
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile
index d05ff81..d96c99c 100644
--- a/usr.bin/chflags/Makefile
+++ b/usr.bin/chflags/Makefile
@@ -1,10 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 NOSHARED?=yes
 
 PROG=	chflags
 CFLAGS+=-Wall
-SRCS=	chflags.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
+SRCS=	chflags.c
+LDADD=	-lutil
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index 1770ffa..04b781f 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	find
-SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
+SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c
+LDADD=	-lutil
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index d21abef..eeb6c19 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,9 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	xinstall
-SRCS=	stat_flags.c xinstall.c
+SRCS=	xinstall.c
 MAN1=	install.1
-.PATH:	${.CURDIR}/../../bin/ls
+LDADD=	-lutil
 
 install: maninstall
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index a85aa4c..1b5bb94 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PROG=	mtree
-SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c stat_flags.c
+SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
 MAN8=	mtree.8
-.PATH:	${.CURDIR}/../../usr.bin/cksum ${.CURDIR}/../../bin/ls
+LDADD=	-lutil
+.PATH:	${.CURDIR}/../../usr.bin/cksum
 
 .if !defined(WORLD)
 DPADD+=	${LIBMD}