Author: obrien
Date: Wed Dec 15 23:24:34 2010
New Revision: 216468
URL: http://svn.freebsd.org/changeset/base/216468
Log:
Rename the generic "CLASS" to the more specific "GEOM_CLASS".
While I'm here remove redundancy and inconsistencies.
Obtained from: Juniper Networks
Modified:
head/sbin/geom/class/Makefile.inc
head/sbin/geom/class/cache/Makefile
head/sbin/geom/class/concat/Makefile
head/sbin/geom/class/eli/Makefile
head/sbin/geom/class/journal/Makefile
head/sbin/geom/class/label/Makefile
head/sbin/geom/class/mirror/Makefile
head/sbin/geom/class/mountver/Makefile
head/sbin/geom/class/multipath/Makefile
head/sbin/geom/class/nop/Makefile
head/sbin/geom/class/part/Makefile
head/sbin/geom/class/raid3/Makefile
head/sbin/geom/class/sched/Makefile
head/sbin/geom/class/shsec/Makefile
head/sbin/geom/class/stripe/Makefile
head/sbin/geom/class/virstor/Makefile
Modified: head/sbin/geom/class/Makefile.inc
==============================================================================
--- head/sbin/geom/class/Makefile.inc Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/Makefile.inc Wed Dec 15 23:24:34 2010
(r216468)
@@ -1,10 +1,10 @@
# $FreeBSD$
-SHLIBDIR?=${CLASS_DIR}
-SHLIB_NAME?=geom_${CLASS}.so
-LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS}
-MAN= g${CLASS}.8
-SRCS+= geom_${CLASS}.c subr.c
+SHLIBDIR?=${GEOM_CLASS_DIR}
+SHLIB_NAME?=geom_${GEOM_CLASS}.so
+LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS}
+MAN= g${GEOM_CLASS}.8
+SRCS+= geom_${GEOM_CLASS}.c subr.c
CFLAGS+= -I${.CURDIR}/../..
Modified: head/sbin/geom/class/cache/Makefile
==============================================================================
--- head/sbin/geom/class/cache/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/cache/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= cache
+GEOM_CLASS= cache
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/concat/Makefile
==============================================================================
--- head/sbin/geom/class/concat/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/concat/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= concat
+GEOM_CLASS= concat
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/eli/Makefile
==============================================================================
--- head/sbin/geom/class/eli/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/eli/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli
${.CURDIR}/../../../../sys/crypto/sha2
-CLASS= eli
+GEOM_CLASS= eli
SRCS= g_eli_crypto.c
SRCS+= g_eli_key.c
SRCS+= pkcs5v2.c
Modified: head/sbin/geom/class/journal/Makefile
==============================================================================
--- head/sbin/geom/class/journal/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/journal/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
-CLASS= journal
+GEOM_CLASS= journal
SRCS+= geom_journal_ufs.c
DPADD= ${LIBMD} ${LIBUFS}
Modified: head/sbin/geom/class/label/Makefile
==============================================================================
--- head/sbin/geom/class/label/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/label/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= label
+GEOM_CLASS= label
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/mirror/Makefile
==============================================================================
--- head/sbin/geom/class/mirror/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/mirror/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
-CLASS= mirror
+GEOM_CLASS= mirror
DPADD= ${LIBMD}
LDADD= -lmd
Modified: head/sbin/geom/class/mountver/Makefile
==============================================================================
--- head/sbin/geom/class/mountver/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/mountver/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= mountver
+GEOM_CLASS= mountver
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/multipath/Makefile
==============================================================================
--- head/sbin/geom/class/multipath/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/multipath/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -1,8 +1,9 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../misc
-CLASS= multipath
-.include <bsd.lib.mk>
+GEOM_CLASS= multipath
CFLAGS+= -I${.CURDIR}/../../../../sys
+
+.include <bsd.lib.mk>
Modified: head/sbin/geom/class/nop/Makefile
==============================================================================
--- head/sbin/geom/class/nop/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/nop/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= nop
+GEOM_CLASS= nop
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/part/Makefile
==============================================================================
--- head/sbin/geom/class/part/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/part/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= part
+GEOM_CLASS= part
DPADD= ${LIBUTIL}
LDADD= -lutil
Modified: head/sbin/geom/class/raid3/Makefile
==============================================================================
--- head/sbin/geom/class/raid3/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/raid3/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= raid3
+GEOM_CLASS= raid3
DPADD= ${LIBMD}
LDADD= -lmd
Modified: head/sbin/geom/class/sched/Makefile
==============================================================================
--- head/sbin/geom/class/sched/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/sched/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,17 +2,10 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../misc
-#CFLAGS += -I/usr/src/sbin/geom
-CLASS=sched
+GEOM_CLASS= sched
-WARNS?= 6
+WARNS?= 6
CLASS_DIR?=/lib/geom
-SHLIBDIR?=${CLASS_DIR}
-SHLIB_NAME?=geom_${CLASS}.so
-LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS}
-MAN= g${CLASS}.8
-SRCS+= geom_${CLASS}.c subr.c
-
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/shsec/Makefile
==============================================================================
--- head/sbin/geom/class/shsec/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/shsec/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= shsec
+GEOM_CLASS= shsec
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/stripe/Makefile
==============================================================================
--- head/sbin/geom/class/stripe/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/stripe/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
-CLASS= stripe
+GEOM_CLASS= stripe
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/virstor/Makefile
==============================================================================
--- head/sbin/geom/class/virstor/Makefile Wed Dec 15 22:59:50 2010
(r216467)
+++ head/sbin/geom/class/virstor/Makefile Wed Dec 15 23:24:34 2010
(r216468)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
+.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
-CLASS= virstor
+GEOM_CLASS= virstor
SRCS+= binstream.c
SRCS+= g_virstor_md.c
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
