From 0d0edd0eef94e9cfbf3e0bb825c32496e15ba3d8 Mon Sep 17 00:00:00 2001 From: itojun Date: Sat, 13 May 2000 19:50:02 +0000 Subject: [PATCH] move LDADD and DPADD to dhcp6/Makefile.inc. --- netbsd/usr.sbin/dhcp6/Makefile.inc | 6 ++++++ netbsd/usr.sbin/dhcp6/dhcp6c/Makefile | 6 ------ netbsd/usr.sbin/dhcp6/dhcp6relay/Makefile | 6 ------ netbsd/usr.sbin/dhcp6/dhcp6s/Makefile | 6 ------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/netbsd/usr.sbin/dhcp6/Makefile.inc b/netbsd/usr.sbin/dhcp6/Makefile.inc index 0b2445b58c..e927d5b718 100644 --- a/netbsd/usr.sbin/dhcp6/Makefile.inc +++ b/netbsd/usr.sbin/dhcp6/Makefile.inc @@ -6,3 +6,9 @@ BINDIR?= /usr/local/v6/sbin MANDIR= /usr/local/v6/man ETCDIR= /usr/local/v6/etc DOCDIR= /usr/local/v6/share/doc + +LDADD+= -L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \ + -L/usr/local/v6/lib -linet6 +DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \ + ${.CURDIR}/../../lib/libinet6/obj/libinet6.a \ + /usr/local/v6/lib/libinet6.a diff --git a/netbsd/usr.sbin/dhcp6/dhcp6c/Makefile b/netbsd/usr.sbin/dhcp6/dhcp6c/Makefile index 03ae5013de..a1e721fb4c 100644 --- a/netbsd/usr.sbin/dhcp6/dhcp6c/Makefile +++ b/netbsd/usr.sbin/dhcp6/dhcp6c/Makefile @@ -5,12 +5,6 @@ PROG= dhcp6c SRCS= dhcp6c.c common.c dhcp6opt.c MAN= dhcp6c.8 -LDADD+= -L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \ - -L/usr/local/v6/lib -linet6 -DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \ - ${.CURDIR}/../../lib/libinet6/obj/libinet6.a \ - /usr/local/v6/lib/libinet6.a - .include .PATH: ${SRCDIR} diff --git a/netbsd/usr.sbin/dhcp6/dhcp6relay/Makefile b/netbsd/usr.sbin/dhcp6/dhcp6relay/Makefile index cc1a48cf63..c39f1ac921 100644 --- a/netbsd/usr.sbin/dhcp6/dhcp6relay/Makefile +++ b/netbsd/usr.sbin/dhcp6/dhcp6relay/Makefile @@ -5,12 +5,6 @@ PROG= dhcp6relay SRCS= dhcp6relay.c common.c MAN= dhcp6relay.8 -LDADD+= -L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \ - -L/usr/local/v6/lib -linet6 -DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \ - ${.CURDIR}/../../lib/libinet6/obj/libinet6.a \ - /usr/local/v6/lib/libinet6.a - .include .PATH: ${SRCDIR} diff --git a/netbsd/usr.sbin/dhcp6/dhcp6s/Makefile b/netbsd/usr.sbin/dhcp6/dhcp6s/Makefile index b1ca3a4c65..bf371307db 100644 --- a/netbsd/usr.sbin/dhcp6/dhcp6s/Makefile +++ b/netbsd/usr.sbin/dhcp6/dhcp6s/Makefile @@ -5,12 +5,6 @@ PROG= dhcp6s SRCS= dhcp6s.c common.c dhcp6opt.c MAN= dhcp6s.8 -LDADD+= -L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \ - -L/usr/local/v6/lib -linet6 -DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \ - ${.CURDIR}/../../lib/libinet6/obj/libinet6.a \ - /usr/local/v6/lib/libinet6.a - .include .PATH: ${SRCDIR}