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 /usr.bin | |
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
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/telnet/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/vacation/Makefile | 28 |
2 files changed, 8 insertions, 24 deletions
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} |