diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2003-05-17 19:05:17 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2003-05-17 19:05:17 +0000 |
| commit | 0b00d54eed78a5cb79f3141df286ad7ee0020630 (patch) | |
| tree | 5a77dcf3996d294a036a66d9a9b9e51561d5c4d1 | |
| parent | ed2f3585f67941ed675ea67aa8f714ebdf088c83 (diff) | |
| download | src-0b00d54eed78a5cb79f3141df286ad7ee0020630.tar.gz src-0b00d54eed78a5cb79f3141df286ad7ee0020630.zip | |
Moved libgeom.so dependencies to where they belong.
Reviewed by: phk
Approved by: re (scottl)
Notes
Notes:
svn path=/head/; revision=115104
| -rw-r--r-- | lib/libgeom/Makefile | 3 | ||||
| -rw-r--r-- | sbin/bsdlabel/Makefile | 4 | ||||
| -rw-r--r-- | sbin/gbde/Makefile | 4 | ||||
| -rw-r--r-- | sbin/sunlabel/Makefile | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile index 35f37262e2e4..f34a5925b7fa 100644 --- a/lib/libgeom/Makefile +++ b/lib/libgeom/Makefile @@ -11,6 +11,9 @@ CFLAGS += -I${.CURDIR} -g WARNS?= 3 +DPADD= ${LIBBSDXML} ${LIBSBUF} +LDADD= -lbsdxml -lsbuf + MAN= libgeom.3 MLINKS+= \ diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index 58c54f5e6f70..82bac93dd6a4 100644 --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -16,8 +16,8 @@ LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS+= bsdlabel.8 disklabel.8 .endif -DDADD= ${LIBGEOM} -LDADD= -lgeom -lbsdxml -lsbuf +DPADD= ${LIBGEOM} +LDADD= -lgeom .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile index 25fe7d8eef1f..a8ca93944c20 100644 --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -23,8 +23,8 @@ CFLAGS+= -I${.CURDIR}/../../sys CLEANFILES+= template.c MAN= gbde.8 -DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lmd -lutil -lgeom -lbsdxml -lsbuf +DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} +LDADD= -lmd -lutil -lgeom template.c: template.txt file2c 'const char template[] = {' ',0};' \ diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile index 2d79124dc11c..65927c6341d1 100644 --- a/sbin/sunlabel/Makefile +++ b/sbin/sunlabel/Makefile @@ -5,8 +5,8 @@ SRCS=sunlabel.c geom_sunlabel_enc.c NOMAN= WARNS=5 -DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lgeom -lbsdxml -lsbuf +DPADD= ${LIBGEOM} +LDADD= -lgeom .PATH: ${.CURDIR}/../../sys/geom |