From 1d55d76a4df27a600b1537c58e13f2f2cf800dd6 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 4 Sep 1996 22:52:00 +0000 Subject: [PATCH] permit YP to be compiled out using flag in bsd.own.mk; pr#15, peter@demon.net --- lib/libc/Makefile | 9 +++++++-- libexec/Makefile | 10 ++++++++-- share/mk/bsd.own.mk | 4 +++- usr.bin/Makefile | 10 ++++++++-- usr.bin/chpass/Makefile | 6 +++++- usr.bin/passwd/Makefile | 10 ++++++++-- usr.sbin/Makefile | 11 ++++++++--- usr.sbin/amd/config/Makefile.config | 6 +++++- usr.sbin/rpc.bootparamd/Makefile | 6 +++++- usr.sbin/rpc.pcnfsd/Makefile | 8 +++++++- usr.sbin/sendmail/src/Makefile | 8 +++++++- 11 files changed, 71 insertions(+), 17 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index f1b82451542..3f0342d7744 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1996/08/19 08:10:10 tholo Exp $ +# $OpenBSD: Makefile,v 1.7 1996/09/04 22:52:00 deraadt Exp $ # # All library objects contain sccsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -14,7 +14,10 @@ # actually call the YP functions, put -DYP on the CFLAGS line below. LIB=c -CFLAGS+=-DNLS -DYP -DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/include +CFLAGS+=-DNLS -DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/include +.if defined(YP) +CFLAGS+=-DYP +.endif LINTFLAGS=-z LLIBS= AINC= -I${.CURDIR}/arch/${MACHINE_ARCH} @@ -48,7 +51,9 @@ CLEANFILES+=tags .include "${.CURDIR}/termios/Makefile.inc" .include "${.CURDIR}/time/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" +.if defined(YP) .include "${.CURDIR}/yp/Makefile.inc" +.endif NLS= C.msg Pig.msg de.msg es.msg fr.msg diff --git a/libexec/Makefile b/libexec/Makefile index 78133d9a387..1c4f4781a45 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,9 +1,15 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $Id: Makefile,v 1.4 1996/08/26 08:40:12 downsj Exp $ +# $Id: Makefile,v 1.5 1996/09/04 22:52:03 deraadt Exp $ + +.include SUBDIR= atrun comsat fingerd ftpd getNAME getty identd lfs_cleanerd \ mail.local makewhatis rexecd rlogind rshd rpc.lockd \ rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd \ - rpc.yppasswdd talkd telnetd tftpd uucpd + talkd telnetd tftpd uucpd + +.if defined(YP) +SUBDIR+=rpc.ypppasswd +.endif .include diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index f172cb2571b..6d9c3077820 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.9 1996/07/27 10:05:52 deraadt Exp $ +# $OpenBSD: bsd.own.mk,v 1.10 1996/09/04 22:52:04 deraadt Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ .if defined(MAKECONF) && exists(${MAKECONF}) @@ -15,6 +15,8 @@ KERBEROS= yes # Defining 'KERBEROS5' causes support for Kerberos5 authentication to be # compiled in. #KERBEROS5= yes +# Defining 'YP' causes support for NIS/YP to be compiled in +YP= yes # where the system object and source trees are kept; can be configurable # by the user in case they want them in ~/foosrc and ~/fooobj, for example diff --git a/usr.bin/Makefile b/usr.bin/Makefile index cfb8b576b66..add18a3f091 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 1996/09/01 19:04:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 1996/09/04 22:52:05 deraadt Exp $ # $NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $ # from: @(#)Makefile 5.8.1.1 (Berkeley) 5/8/91 +.include + SUBDIR= apply apropos arch asa at awk banner basename bdes biff cal calendar \ cap_mkdb cdio checknr chflags chpass cksum cmp col colcrt colrm \ column comm compress cpp crontab ctags cut dirname du encrypt \ @@ -19,7 +21,11 @@ SUBDIR= apply apropos arch asa at awk banner basename bdes biff cal calendar \ unifdef uniq units unvis users uudecode uuencode \ vacation vgrind vi vis vmstat w wall wc what whatis whereis \ which who whois window write \ - xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich + xargs xinstall xlint xstr yacc yes + +.if defined(YP) +SUBDIR+=ypcat ypmatch ypwhich +.endif # Don't use the standard tool chain on the alpha or mips. .if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips") diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 5ecc1ca300f..c2d4bed1da3 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,6 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 1996/06/26 05:31:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1996/09/04 22:52:06 deraadt Exp $ # $NetBSD: Makefile,v 1.6 1996/05/15 21:50:39 jtc Exp $ +.include + PROG= chpass SRCS= chpass.c edit.c field.c pw_yp.c table.c util.c getpwent.c BINOWN= root @@ -8,7 +10,9 @@ BINMODE=4555 .PATH: ${.CURDIR}/../../lib/libc/gen LINKS= ${BINDIR}/chpass ${BINDIR}/chfn ${BINDIR}/chpass ${BINDIR}/chsh MLINKS= chpass.1 chfn.1 chpass.1 chsh.1 +.if defined(YP) CFLAGS+=-DYP +.endif DPADD+= ${LIBRPCSVC} ${LIBUTIL} LDADD+= -lrpcsvc -lutil diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index c6111c990e6..a06e595ccc9 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,11 +1,17 @@ -# $OpenBSD: Makefile,v 1.7 1996/05/22 11:35:26 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 1996/09/04 22:52:06 deraadt Exp $ + +.include PROG= passwd SRCS= local_passwd.c yp_passwd.c passwd.c getpwent.c .PATH: ${.CURDIR}/../../lib/libc/gen DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL} LDADD+= -lrpcsvc -lcrypt -lutil -CFLAGS+=-I${.CURDIR} -DYP +CFLAGS+=-I${.CURDIR} + +.if defined(YP) +CFLAGS+=-DYP +.endif .include # For Kerberos diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 46a0ccfb932..6e448bb183d 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 1996/08/26 07:50:12 downsj Exp $ +# $OpenBSD: Makefile,v 1.18 1996/09/04 22:52:07 deraadt Exp $ # not yet done: catman +.include + SUBDIR= ac accton arp bootpd bootpgw bootpef bootptest \ chown chroot config cron dev_mkdb \ diskpart edquota gspa inetd iostat \ @@ -12,8 +14,11 @@ SUBDIR= ac accton arp bootpd bootpgw bootpef bootptest \ rpc.bootparamd rpc.pcnfsd rwhod \ sa sendmail sliplogin slstats spray sysctl \ syslogd tcpdump timed traceroute trpt trsp \ - vipw vnconfig ypbind yppoll ypset \ - ypserv zdump zic + vipw vnconfig zdump zic + +.if defined (YP) +SUBDIR+=ypbind yppoll ypset ypserv +.endif # should be listed above, but doesn't work on the Alpha. .if (${MACHINE_ARCH} != "alpha") || make(clean) || make(cleandir) diff --git a/usr.sbin/amd/config/Makefile.config b/usr.sbin/amd/config/Makefile.config index c3e484dbdab..e7b692c60cc 100644 --- a/usr.sbin/amd/config/Makefile.config +++ b/usr.sbin/amd/config/Makefile.config @@ -1,7 +1,9 @@ # from: @(#)Makefile.config 8.1 (Berkeley) 6/6/93 -# $Id: Makefile.config,v 1.1.1.1 1995/10/18 08:47:13 deraadt Exp $ +# $Id: Makefile.config,v 1.2 1996/09/04 22:52:08 deraadt Exp $ # +.include + OS = bsd44 # @@ -42,7 +44,9 @@ OS = bsd44 # Also define HAS_NIS_RELOAD to include map # enumeration code implementing "cache:=all" # +.if defined(YP) HAS_NIS_MAPS = -DHAS_NIS_MAPS -DHAS_NIS_RELOAD +.endif # # Include support for file maps diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile index f6d7c0b4129..d984ea4109e 100644 --- a/usr.sbin/rpc.bootparamd/Makefile +++ b/usr.sbin/rpc.bootparamd/Makefile @@ -1,6 +1,10 @@ -# $Id: Makefile,v 1.1.1.1 1995/10/18 08:48:05 deraadt Exp $ +# $Id: Makefile,v 1.2 1996/09/04 22:52:09 deraadt Exp $ +.include + +.if defined(YP) CFLAGS+=-DYP +.endif PROG= rpc.bootparamd SRCS= bootparamd.c bootparam_prot_svc.c diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile index 368adf8e79a..c658251d5d1 100644 --- a/usr.sbin/rpc.pcnfsd/Makefile +++ b/usr.sbin/rpc.pcnfsd/Makefile @@ -1,9 +1,15 @@ # $NetBSD: Makefile,v 1.3 1995/07/25 22:20:13 gwr Exp $ +.include + PROG= rpc.pcnfsd MAN= pcnfsd.8 MLINKS= pcnfsd.8 rpc.pcnfsd.8 -CFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR} +CFLAGS += -DUSER_CACHE -DWTMP -I${.OBJDIR} + +.if defined(YP) +CFLAGS+=-DUSE_YP +.endif SRCS= pcnfsd_v1.c pcnfsd_v2.c pcnfsd_misc.c \ pcnfsd_cache.c pcnfsd_print.c pcnfsd_svc.c pcnfsd_xdr.c diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile index 0fa39dba444..fb171f7bd52 100644 --- a/usr.sbin/sendmail/src/Makefile +++ b/usr.sbin/sendmail/src/Makefile @@ -6,6 +6,8 @@ # @Id: Makefile.NetBSD,v 1.3 1994/02/01 05:33:44 glass Exp $ # +.include + PROG= sendmail # define the database format to use for aliases et al. Can be -DNEWDB (for @@ -16,7 +18,11 @@ PROG= sendmail # databases are read, but the new format will be used on any rebuilds. On # really gnarly systems, you can set this to null; it will crawl like a high # spiral snail, but it will work. -DBMDEF= -DNEWDB -DNIS +DBMDEF= -DNEWDB + +.if defined(YP) +DBMDEF+=-DNIS +.endif CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -- 2.20.1