Module Name: src
Committed By: dholland
Date: Wed Feb 1 17:53:02 UTC 2012
Modified Files:
src/libexec/rpc.rquotad: Makefile
src/usr.bin/quota: Makefile
src/usr.sbin/edquota: Makefile
src/usr.sbin/quotactl: Makefile
src/usr.sbin/quotaon: Makefile
src/usr.sbin/repquota: Makefile
Log Message:
libquota no longer requires libprop. Also remove some other no-longer-used
.PATH'd-in bits from repquota.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/libexec/rpc.rquotad/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/quota/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/edquota/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/quotactl/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/quotaon/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/repquota/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/rpc.rquotad/Makefile
diff -u src/libexec/rpc.rquotad/Makefile:1.8 src/libexec/rpc.rquotad/Makefile:1.9
--- src/libexec/rpc.rquotad/Makefile:1.8 Thu Mar 24 17:05:43 2011
+++ src/libexec/rpc.rquotad/Makefile Wed Feb 1 17:53:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/03/24 17:05:43 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2012/02/01 17:53:01 dholland Exp $
.include <bsd.own.mk>
PROG = rpc.rquotad
@@ -6,7 +6,7 @@ SRCS = rquotad.c
MAN = rpc.rquotad.8
MLINKS = rpc.rquotad.8 rquotad.8
-DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
-LDADD= -lquota -lrpcsvc -lprop
+DPADD= ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lquota -lrpcsvc
.include <bsd.prog.mk>
Index: src/usr.bin/quota/Makefile
diff -u src/usr.bin/quota/Makefile:1.11 src/usr.bin/quota/Makefile:1.12
--- src/usr.bin/quota/Makefile:1.11 Mon Jan 9 15:35:44 2012
+++ src/usr.bin/quota/Makefile Wed Feb 1 17:53:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/01/09 15:35:44 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2012/02/01 17:53:01 dholland Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
WARNS ?= 4
@@ -7,7 +7,7 @@ PROG= quota
SRCS= quota.c printquota.c
CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/quota
-DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
-LDADD= -lquota -lrpcsvc -lprop
+DPADD= ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lquota -lrpcsvc
.include <bsd.prog.mk>
Index: src/usr.sbin/edquota/Makefile
diff -u src/usr.sbin/edquota/Makefile:1.10 src/usr.sbin/edquota/Makefile:1.11
--- src/usr.sbin/edquota/Makefile:1.10 Mon Jan 30 19:19:20 2012
+++ src/usr.sbin/edquota/Makefile Wed Feb 1 17:53:01 2012
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.10 2012/01/30 19:19:20 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/02/01 17:53:01 dholland Exp $
.include <bsd.own.mk>
@@ -9,8 +9,8 @@ SRCS= edquota.c
MAN= edquota.8
CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/usr.bin/quota
-DPADD= ${LIBQUOTA} ${LIBPROP} ${LIBRPCSVC}
-LDADD= -lquota -lprop -lrpcsvc
+DPADD= ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
SRCS+= printquota.c
Index: src/usr.sbin/quotactl/Makefile
diff -u src/usr.sbin/quotactl/Makefile:1.5 src/usr.sbin/quotactl/Makefile:1.6
--- src/usr.sbin/quotactl/Makefile:1.5 Mon Jan 30 19:31:31 2012
+++ src/usr.sbin/quotactl/Makefile Wed Feb 1 17:53:01 2012
@@ -1,12 +1,12 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.5 2012/01/30 19:31:31 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2012/02/01 17:53:01 dholland Exp $
.include <bsd.own.mk>
PROG= quotactl
SRCS= quotactl.c proplib-interpreter.c quotaprop.c
MAN= quotactl.8
-DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
-LDADD= -lquota -lrpcsvc -lprop
+DPADD= ${LIBPROP} ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lprop -lquota -lrpcsvc
.include <bsd.prog.mk>
Index: src/usr.sbin/quotaon/Makefile
diff -u src/usr.sbin/quotaon/Makefile:1.9 src/usr.sbin/quotaon/Makefile:1.10
--- src/usr.sbin/quotaon/Makefile:1.9 Mon Jan 30 16:45:13 2012
+++ src/usr.sbin/quotaon/Makefile Wed Feb 1 17:53:01 2012
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.9 2012/01/30 16:45:13 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2012/02/01 17:53:01 dholland Exp $
.include <bsd.own.mk>
WARNS ?= 4
@@ -10,7 +10,7 @@ MAN= quotaon.8
MLINKS= quotaon.8 quotaoff.8
LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff
-DPADD= ${LIBQUOTA} ${LIBPROP} ${LIBRPCSVC}
-LDADD= -lquota -lprop -lrpcsvc
+DPADD= ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lquota -lrpcsvc
.include <bsd.prog.mk>
Index: src/usr.sbin/repquota/Makefile
diff -u src/usr.sbin/repquota/Makefile:1.8 src/usr.sbin/repquota/Makefile:1.9
--- src/usr.sbin/repquota/Makefile:1.8 Thu Mar 24 17:05:47 2011
+++ src/usr.sbin/repquota/Makefile Wed Feb 1 17:53:01 2012
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.8 2011/03/24 17:05:47 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2012/02/01 17:53:01 dholland Exp $
WARNS ?= 4
.include <bsd.own.mk>
@@ -8,12 +8,10 @@ SRCS= repquota.c
MAN= repquota.8
CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/usr.bin/quota
-DPADD= ${LIBQUOTA} ${LIBPROP} ${LIBRPCSVC}
-LDADD= -lquota -lprop -lrpcsvc
+DPADD= ${LIBQUOTA} ${LIBRPCSVC}
+LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
-SRCS+= printquota.c quotautil.c
-.PATH: ${NETBSDSRCDIR}/sys/ufs/ufs
-SRCS+= quota1_subr.c
+SRCS+= printquota.c
.include <bsd.prog.mk>
