Remove kludges intended to support src trees with partial obj trees.

Discussed with:	ru

10 files changed, 34 insertions, 113 deletions

diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index d7844f5..900730b 100644
--- a/usr.sbin/cron/Makefile.inc
+++ b/usr.sbin/cron/Makefile.inc
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-.if exists(${.OBJDIR}/../lib)
 LIBCRON= ${.OBJDIR}/../lib/libcron.a
-.else
-LIBCRON= ${.CURDIR}/../lib/libcron.a
-.endif
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index b141bfd..93e3e07 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -10,26 +10,14 @@ MAN=	editmap.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
-.if exists(${.OBJDIR}/../../lib/libsm)
-LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
-.else
-LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
-.endif
-LIBSM:=		${LIBSMDIR}/libsm.a
-
-.if exists(${.OBJDIR}/../../lib/libsmdb)
-LIBSMDBDIR:=	${.OBJDIR}/../../lib/libsmdb
-.else
-LIBSMDBDIR!=	cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
-.endif
-LIBSMDB:=	${LIBSMDBDIR}/libsmdb.a
-
-.if exists(${.OBJDIR}/../../lib/libsmutil)
-LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
-.else
-LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
-.endif
-LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBSM=		${LIBSMDIR}/libsm.a
+
+LIBSMDBDIR=	${.OBJDIR}/../../lib/libsmdb
+LIBSMDB=	${LIBSMDBDIR}/libsmdb.a
+
+LIBSMUTILDIR=	${.OBJDIR}/../../lib/libsmutil
+LIBSMUTIL=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
 LDADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index 13b94c2..1854882 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -2,10 +2,6 @@
 
 CFLAGS+= -DINET6
 
-.if exists(${.OBJDIR}/../common_source)
 LIBLPR=	${.OBJDIR}/../common_source/liblpr.a
-.else
-LIBLPR=	${.CURDIR}/../common_source/liblpr.a
-.endif
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index eddfdd9..86137b0 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -11,19 +11,11 @@ MAN=	mailstats.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNOT_SENDMAIL
 
-.if exists(${.OBJDIR}/../../lib/libsm)
-LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
-.else
-LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
-.endif
-LIBSM:=		${LIBSMDIR}/libsm.a
-
-.if exists(${.OBJDIR}/../../lib/libsmutil)
-LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
-.else
-LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
-.endif
-LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBSM=		${LIBSMDIR}/libsm.a
+
+LIBSMUTILDIR=	${.OBJDIR}/../../lib/libsmutil
+LIBSMUTIL=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD=	${LIBSMUTIL} ${LIBSM}
 LDADD=	${LIBSMUTIL} ${LIBSM}
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index bb7de3e..5d30c67 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -11,26 +11,14 @@ MAN=	makemap.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
-.if exists(${.OBJDIR}/../../lib/libsm)
-LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
-.else
-LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
-.endif
-LIBSM:=		${LIBSMDIR}/libsm.a
-
-.if exists(${.OBJDIR}/../../lib/libsmdb)
-LIBSMDBDIR:=	${.OBJDIR}/../../lib/libsmdb
-.else
-LIBSMDBDIR!=	cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
-.endif
-LIBSMDB:=	${LIBSMDBDIR}/libsmdb.a
-
-.if exists(${.OBJDIR}/../../lib/libsmutil)
-LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
-.else
-LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
-.endif
-LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBSM=		${LIBSMDIR}/libsm.a
+
+LIBSMDBDIR=	${.OBJDIR}/../../lib/libsmdb
+LIBSMDB=	${LIBSMDBDIR}/libsmdb.a
+
+LIBSMUTILDIR=	${.OBJDIR}/../../lib/libsmutil
+LIBSMUTIL=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
 LDADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index 63c2210..6ecd80d 100644
--- a/usr.sbin/mrouted/Makefile.inc
+++ b/usr.sbin/mrouted/Makefile.inc
@@ -2,10 +2,6 @@
 
 CFLAGS+= -DRSRR -Dlog=logit
 
-.if exists(${.OBJDIR}/../common)
 LIBMROUTED=	${.OBJDIR}/../common/libmrouted.a
-.else
-LIBMROUTED=	${.CURDIR}/../common/libmrouted.a
-.endif
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 845d28a..3a85910 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -12,16 +12,7 @@ CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 CFLAGS+= -DOPENSSL
 .endif
 
-.if exists(${.OBJDIR}/../libparse)
 LIBPARSE=	${.OBJDIR}/../libparse/libparse.a
-.else
-LIBPARSE=	${.CURDIR}/../libparse/libparse.a
-.endif
-
-.if exists(${.OBJDIR}/../libntp)
 LIBNTP=	${.OBJDIR}/../libntp/libntp.a
-.else
-LIBNTP=	${.CURDIR}/../libntp/libntp.a
-.endif
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 46518b9..e27d31a 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,10 +1,6 @@
 # $FreeBSD$
 
-.if exists(${.OBJDIR}/../lib)
 LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
-.else
-LIBINSTALL=	${.CURDIR}/../lib/libinstall.a
-.endif
 
 .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
     defined(LDADD) && ${LDADD:M-lfetch} != ""
@@ -13,6 +9,4 @@ LDADD+=		-lssl -lcrypto
 .endif
 
 # Inherit BINDIR from one level up.
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
+.include "../Makefile.inc"
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 280e164..81fd4d1 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -11,26 +11,14 @@ MAN=	praliases.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
-.if exists(${.OBJDIR}/../../lib/libsm)
-LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
-.else
-LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
-.endif
-LIBSM:=		${LIBSMDIR}/libsm.a
-
-.if exists(${.OBJDIR}/../../lib/libsmdb)
-LIBSMDBDIR:=	${.OBJDIR}/../../lib/libsmdb
-.else
-LIBSMDBDIR!=	cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
-.endif
-LIBSMDB:=	${LIBSMDBDIR}/libsmdb.a
-
-.if exists(${.OBJDIR}/../../lib/libsmutil)
-LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
-.else
-LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
-.endif
-LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBSM=		${LIBSMDIR}/libsm.a
+
+LIBSMDBDIR=	${.OBJDIR}/../../lib/libsmdb
+LIBSMDB=	${LIBSMDBDIR}/libsmdb.a
+
+LIBSMUTILDIR=	${.OBJDIR}/../../lib/libsmutil
+LIBSMUTIL=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
 LDADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 7db47d0..dcf6e5b 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -43,19 +43,11 @@ CFLAGS+= -DNETINET6
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap
 
-.if exists(${.OBJDIR}/../../lib/libsm)
-LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
-.else
-LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
-.endif
-LIBSM:=		${LIBSMDIR}/libsm.a
+LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBSM=		${LIBSMDIR}/libsm.a
 
-.if exists(${.OBJDIR}/../../lib/libsmutil)
-LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
-.else
-LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
-.endif
-LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+LIBSMUTILDIR=	${.OBJDIR}/../../lib/libsmutil
+LIBSMUTIL=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD+=	${LIBSMUTIL} ${LIBSM}
 LDADD+=	${LIBSMUTIL} ${LIBSM}