d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the generic "CLASS" to the more specific "GEOM_CLASS".

Browse Source 
While I'm here remove redundancy and inconsistencies.

Obtained from: Juniper Networks
This commit is contained in:
David E. O'Brien 2010-12-15 23:24:34 +00:00
parent 8c9cef57ac
commit 7838c4d1c1
16 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/geom/class/Makefile.inc
View File

@ -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}/../..

2
sbin/geom/class/cache/Makefile vendored
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= cache
GEOM_CLASS= cache
.include <bsd.lib.mk>

2
sbin/geom/class/concat/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= concat
GEOM_CLASS= concat
.include <bsd.lib.mk>

2
sbin/geom/class/eli/Makefile
View File

@ -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

4
sbin/geom/class/journal/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../misc
.PATH: ${.CURDIR}/../../misc
CLASS= journal
GEOM_CLASS= journal
SRCS+= geom_journal_ufs.c
DPADD= ${LIBMD} ${LIBUFS}

2
sbin/geom/class/label/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= label
GEOM_CLASS= label
.include <bsd.lib.mk>

4
sbin/geom/class/mirror/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../misc
.PATH: ${.CURDIR}/../../misc
CLASS= mirror
GEOM_CLASS= mirror
DPADD= ${LIBMD}
LDADD= -lmd

2
sbin/geom/class/mountver/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= mountver
GEOM_CLASS= mountver
.include <bsd.lib.mk>

5
sbin/geom/class/multipath/Makefile
View File

@ -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>

2
sbin/geom/class/nop/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= nop
GEOM_CLASS= nop
.include <bsd.lib.mk>

2
sbin/geom/class/part/Makefile
View File

@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../misc
CLASS= part
GEOM_CLASS= part
DPADD= ${LIBUTIL}
LDADD= -lutil

2
sbin/geom/class/raid3/Makefile
View File

@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../misc
CLASS= raid3
GEOM_CLASS= raid3
DPADD= ${LIBMD}
LDADD= -lmd

11
sbin/geom/class/sched/Makefile
View File

@ -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>

2
sbin/geom/class/shsec/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= shsec
GEOM_CLASS= shsec
.include <bsd.lib.mk>

2
sbin/geom/class/stripe/Makefile
View File

@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../misc
CLASS= stripe
GEOM_CLASS= stripe
.include <bsd.lib.mk>

4
sbin/geom/class/virstor/Makefile
View File

@ -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