diff options
author | des <des@FreeBSD.org> | 2005-06-10 06:12:53 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2005-06-10 06:12:53 +0000 |
commit | 2bb8de20fe30f1cc02ae127bd04e473b19e23441 (patch) | |
tree | 086bc6374cc176de9e2533a2b8b25ab0ef497b15 | |
parent | 508e67396ea922c5e3249f730d7004fa6edba0b2 (diff) | |
download | FreeBSD-src-2bb8de20fe30f1cc02ae127bd04e473b19e23441.zip FreeBSD-src-2bb8de20fe30f1cc02ae127bd04e473b19e23441.tar.gz |
Remove kludges intended to support src trees with partial obj trees.
Discussed with: ru
-rw-r--r-- | bin/rmail/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/Makefile.inc | 12 | ||||
-rw-r--r-- | gnu/usr.bin/groff/Makefile.inc | 6 | ||||
-rw-r--r-- | gnu/usr.bin/man/Makefile.inc | 7 | ||||
-rw-r--r-- | gnu/usr.bin/rcs/Makefile.inc | 6 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/Makefile.inc | 5 | ||||
-rw-r--r-- | kerberos5/Makefile.inc | 9 | ||||
-rw-r--r-- | libexec/mail.local/Makefile | 8 | ||||
-rw-r--r-- | libexec/smrsh/Makefile | 8 | ||||
-rw-r--r-- | libexec/telnetd/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/telnet/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/vacation/Makefile | 28 | ||||
-rw-r--r-- | usr.sbin/cron/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.sbin/editmap/Makefile | 28 | ||||
-rw-r--r-- | usr.sbin/lpr/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.sbin/mailstats/Makefile | 18 | ||||
-rw-r--r-- | usr.sbin/makemap/Makefile | 28 | ||||
-rw-r--r-- | usr.sbin/mrouted/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/Makefile.inc | 9 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile.inc | 8 | ||||
-rw-r--r-- | usr.sbin/praliases/Makefile | 28 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 16 |
22 files changed, 52 insertions, 200 deletions
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index d2ea1fa..bf65d1c 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -14,12 +14,8 @@ MAN= rmail.8 WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -.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 DPADD= ${LIBSM} LDADD= ${LIBSM} diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc index e1889d6..4acfa0b 100644 --- a/gnu/usr.bin/cvs/Makefile.inc +++ b/gnu/usr.bin/cvs/Makefile.inc @@ -1,21 +1,13 @@ +# $FreeBSD$ + .if !defined(CVSDIR) CVSDIR= $(.CURDIR)/../../../../contrib/cvs -.if exists(${.OBJDIR}/../lib) LIBCVSDIR= ${.OBJDIR}/../lib -.else -LIBCVSDIR= ${.CURDIR}/../lib -.endif - LIBCVS= ${LIBCVSDIR}/libcvs.a -.if exists(${.OBJDIR}/../libdiff) LIBDIFFDIR= ${.OBJDIR}/../libdiff -.else -LIBDIFFDIR= ${.CURDIR}/../libdiff -.endif - LIBDIFF= ${LIBDIFFDIR}/libdiff.a .if exists(${.CURDIR}/../../Makefile.inc) diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index d197751..a7eb35a 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -66,15 +66,9 @@ indexname=Ind # Libraries # Bad assumption, if one exists they all exist -.if exists(${.OBJDIR}/${TOPREL}/src/libs/libgroff) LIBGROFF= ${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a LIBDRIVER= ${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a LIBBIB= ${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a -.else -LIBGROFF= ${.CURDIR}/${TOPREL}/src/libs/libgroff/libgroff.a -LIBDRIVER= ${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a -LIBBIB= ${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a -.endif CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc index 5793e15..e1caf90 100644 --- a/gnu/usr.bin/man/Makefile.inc +++ b/gnu/usr.bin/man/Makefile.inc @@ -25,12 +25,7 @@ zcat= /usr/bin/zcat compress= /usr/bin/gzip -c compext= .gz -.if exists(${.OBJDIR}/../lib) LIBDESTDIR= ${.OBJDIR}/../lib -.else -LIBDESTDIR= ${.CURDIR}/../lib -.endif - -LIBMAN= ${LIBDESTDIR}/libman.a +LIBMAN= ${LIBDESTDIR}/libman.a .include "../Makefile.inc" diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc index 22d60d7..a46437a 100644 --- a/gnu/usr.bin/rcs/Makefile.inc +++ b/gnu/usr.bin/rcs/Makefile.inc @@ -1,7 +1,3 @@ -# Location of librcs +# $FreeBSD$ -.if exists(${.OBJDIR}/../lib) LIBRCS= ${.OBJDIR}/../lib/librcs.a -.else -LIBRCS= ${.CURDIR}/../lib/librcs.a -.endif diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index f13fa38..d5c8e81 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -1,12 +1,7 @@ # $FreeBSD$ TXIDIR= ${.CURDIR}/../../../../contrib/texinfo - -.if exists(${.OBJDIR}/../libtxi) LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a -.else -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -.endif CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \ -I${TXIDIR} -I${TXIDIR}/lib diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 94b4102..6e799ff 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -15,17 +15,8 @@ LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib .endif -.if exists(${.OBJDIR}/../../lib/libvers) LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a -.else -LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a -.endif - -.if exists(${.OBJDIR}/../../lib/libsl) LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a -.else -LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a -.endif .if defined(SRCS) diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 92a68a4..57837d1 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -10,12 +10,8 @@ MAN= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include -I. WFORMAT=0 -.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 DPADD= ${LIBSM} LDADD= ${LIBSM} diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 458d93c..6fd2801 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -9,12 +9,8 @@ SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -.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 DPADD= ${LIBSM} LDADD= ${LIBSM} diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 293ecdc..68b2be6 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -19,11 +19,7 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ WARNS?= 2 WFORMAT?= 0 -.if exists(${.OBJDIR}/../../lib/libtelnet) LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 1394379..e364934 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -11,11 +11,7 @@ SRCS= commands.c main.c network.c ring.c sys_bsd.c \ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ -.if exists(${.OBJDIR}/../../lib/libtelnet) LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif DPADD= ${LIBTERMCAP} ${LIBTELNET} LDADD= -ltermcap ${LIBTELNET} diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index b7d5584..63ba3ab 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -9,26 +9,14 @@ CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG -.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/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} |