Moved libgeom.so dependencies to where they belong.

Reviewed by:	phk
Approved by:	re (scottl)

lib/libgeom/Makefile

@@ -11,6 +11,9 @@ CFLAGS += -I${.CURDIR} -g
 
 WARNS?=	3
 
+DPADD=	${LIBBSDXML} ${LIBSBUF}
+LDADD=	-lbsdxml -lsbuf
+
 MAN=	libgeom.3
 
 MLINKS+= \

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

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};' \

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