mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-11 14:10:34 +00:00
Code Issues Releases Activity

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

Browse Source 
Discussed with:	ru
This commit is contained in:
Dag-Erling Smørgrav 2005-06-10 06:12:53 +00:00
parent 4c3763445d
commit ee66677a7a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147225
22 changed files with 43 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/rmail/Makefile
View File

@ -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}

12
gnu/usr.bin/cvs/Makefile.inc
View File

@ -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)

6
gnu/usr.bin/groff/Makefile.inc
View File

@ -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

7
gnu/usr.bin/man/Makefile.inc
View File

@ -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"

6
gnu/usr.bin/rcs/Makefile.inc
View File

@ -1,7 +1,3 @@
# Location of librcs
# $FreeBSD$
.if exists(${.OBJDIR}/../lib)
LIBRCS= ${.OBJDIR}/../lib/librcs.a
.else
LIBRCS= ${.CURDIR}/../lib/librcs.a
.endif

5
gnu/usr.bin/texinfo/Makefile.inc
View File

@ -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

9
kerberos5/Makefile.inc
View File

@ -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)

8
libexec/mail.local/Makefile
View File

@ -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}

8
libexec/smrsh/Makefile
View File

@ -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}

4
libexec/telnetd/Makefile
View File

@ -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}

4
usr.bin/telnet/Makefile
View File

@ -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}

24
usr.bin/vacation/Makefile
View File

@ -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
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
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
LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb
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
LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil
LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a
DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}

4
usr.sbin/cron/Makefile.inc
View File

@ -1,9 +1,5 @@
# $FreeBSD$
.if exists(${.OBJDIR}/../lib)
LIBCRON= ${.OBJDIR}/../lib/libcron.a
.else
LIBCRON= ${.CURDIR}/../lib/libcron.a
.endif
.include "../Makefile.inc"

24
usr.sbin/editmap/Makefile
View File

@ -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
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
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
LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb
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
LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil
LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a
DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}

4
usr.sbin/lpr/Makefile.inc
View File

@ -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"

16
usr.sbin/mailstats/Makefile
View File

@ -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
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}

24
usr.sbin/makemap/Makefile
View File

@ -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
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
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
LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb
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
LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil
LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a
DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}

4
usr.sbin/mrouted/Makefile.inc
View File

@ -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"

9
usr.sbin/ntp/Makefile.inc
View File

@ -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"

8
usr.sbin/pkg_install/Makefile.inc
View File

@ -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"

24
usr.sbin/praliases/Makefile
View File

@ -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
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
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
LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb
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
LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil
LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a
DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}

16
usr.sbin/sendmail/Makefile
View File

@ -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}