diff options
| author | pjd <pjd@FreeBSD.org> | 2004-05-20 20:12:17 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-05-20 20:12:17 +0000 |
| commit | ccdf5be9cee57e90f450a0321adac161fc97f195 (patch) | |
| tree | 6a933ff5edbcb38c623f7e2848a6bf11c123cd4d /sbin | |
| parent | ad72c978dabe88e013354d497aac877e44e68baa (diff) | |
| download | FreeBSD-src-ccdf5be9cee57e90f450a0321adac161fc97f195.zip FreeBSD-src-ccdf5be9cee57e90f450a0321adac161fc97f195.tar.gz | |
Various style.Makefile(5) improvements.
Inspired by: ru
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/geom/Makefile.inc | 5 | ||||
| -rw-r--r-- | sbin/geom/class/Makefile.inc | 14 | ||||
| -rw-r--r-- | sbin/geom/class/concat/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/nop/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/stripe/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/core/Makefile | 12 |
6 files changed, 19 insertions, 21 deletions
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc index 703f701..ac8d315 100644 --- a/sbin/geom/Makefile.inc +++ b/sbin/geom/Makefile.inc @@ -1,5 +1,6 @@ # $FreeBSD$ -BINDIR?=/sbin -CLASSDIR?=/lib/geom WARNS?= 6 +CLASSDIR?=/lib/geom + +.include "../Makefile.inc" diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc index 5fbe1f5..711c087 100644 --- a/sbin/geom/class/Makefile.inc +++ b/sbin/geom/class/Makefile.inc @@ -1,13 +1,13 @@ # $FreeBSD$ -.include "../Makefile.inc" - -LIBDIR?=${CLASSDIR} -SHLIB_MAJOR=1 +LIBDIR?= ${CLASSDIR} -SRCS= geom_${CLASS}.c subr.c -SHLIB_NAME?=geom_${CLASS}.so.${SHLIB_MAJOR} +SHLIB_MAJOR= 1 +SHLIB_NAME?= geom_${CLASS}.so.${SHLIB_MAJOR} LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} MAN= g${CLASS}.8 +SRCS= geom_${CLASS}.c subr.c + +CFLAGS+= -I${.CURDIR}/../.. -CFLAGS+=-I${.CURDIR}/../.. +.include "../Makefile.inc" diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile index c2b9100..16f81a5 100644 --- a/sbin/geom/class/concat/Makefile +++ b/sbin/geom/class/concat/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR}/../../misc CLASS= concat - NOMAN= notyet .include <bsd.lib.mk> diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile index 0c62d32..dc668aa 100644 --- a/sbin/geom/class/nop/Makefile +++ b/sbin/geom/class/nop/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR}/../../misc CLASS= nop - NOMAN= notyet .include <bsd.lib.mk> diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile index 7db131f..35e9f13 100644 --- a/sbin/geom/class/stripe/Makefile +++ b/sbin/geom/class/stripe/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR}/../../misc CLASS= stripe - NOMAN= notyet .include <bsd.lib.mk> diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile index e65c99d..d17d51a 100644 --- a/sbin/geom/core/Makefile +++ b/sbin/geom/core/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../misc +.PATH: ${.CURDIR}/../misc PROG= geom -SRCS= geom.c subr.c -#MAN= geom.8 NOMAN= notyet +SRCS= geom.c subr.c + +CFLAGS+= -DCLASSDIR=\"${CLASSDIR}\" +CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. + DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} LDADD= -lgeom -lsbuf -lbsdxml -WARNS?= 6 -CFLAGS+=-I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. -CFLAGS+=-DCLASSDIR=\"${CLASSDIR}\" .include <bsd.prog.mk> |
