From 07736e20e93c9a98de654927c637dd89da236bb1 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 21 Dec 2004 09:08:06 +0000 Subject: [PATCH] NOATM -> NO_ATM --- lib/Makefile | 2 +- lib/libbsnmp/modules/Makefile | 2 +- rescue/rescue/Makefile | 2 +- sbin/Makefile | 2 +- share/examples/etc/make.conf | 4 ++-- share/man/man5/make.conf.5 | 2 +- share/mk/bsd.compat.mk | 1 + share/mk/bsd.init.mk | 1 + tools/tools/nanobsd/make.conf | 2 +- usr.bin/Makefile | 2 +- usr.sbin/Makefile | 2 +- usr.sbin/bsnmpd/modules/Makefile | 2 +- usr.sbin/ppp/Makefile | 4 ++-- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index e1668ff3c32c..eebbb1bc7645 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -42,7 +42,7 @@ _csu=csu/${MACHINE_ARCH} _csu=csu .endif -.if !defined(NOATM) +.if !defined(NO_ATM) _libatm= libatm _libngatm= libngatm .endif diff --git a/lib/libbsnmp/modules/Makefile b/lib/libbsnmp/modules/Makefile index 6f5bd6a2a36a..8e8c21596d32 100644 --- a/lib/libbsnmp/modules/Makefile +++ b/lib/libbsnmp/modules/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd -.if !defined(NOATM) +.if !defined(NO_ATM) _snmp_atm= snmp_atm .endif diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index b3602c4a89ab..dd0eb58360f5 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -114,7 +114,7 @@ CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel \ restore rcorder route routed rtquery rtsol savecore \ slattach spppcontrol startslip swapon sysctl tunefs umount -.if !defined(NOATM) +.if !defined(NO_ATM) CRUNCH_PROGS_sbin+= atm atmconfig fore_dnld ilmid CRUNCH_LIBS+= -latm .endif diff --git a/sbin/Makefile b/sbin/Makefile index c6a78ecef028..536dafcf1368 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -94,7 +94,7 @@ SUBDIR= adjkerntz \ tunefs \ umount \ -.if !defined(NOATM) +.if !defined(NO_ATM) _atm= atm .endif diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index d85e10e2a4e5..5818569ef7d0 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -106,7 +106,7 @@ # # To avoid building various parts of the base system: #NO_ACPI= # do not build acpiconf(8) and related programs -#NOATM= # do not build ATM related programs and libraries +#NO_ATM= # do not build ATM related programs and libraries #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader @@ -128,7 +128,7 @@ #NO_LIBTHR= # do not build libthr (1:1 threading library) #NO_LPR= # do not build lpr and related programs #NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector -#NO_MAN= # do not build manual pages +#NO_MAN= # do not build manual pages #NO_MODULES= # do not build modules with the kernel #NO_NIS= # do not build NIS support and related programs #NO_OBJC= # do not build Objective C support diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index f48d7148ec64..8ef203e1d86b 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -463,7 +463,7 @@ programs and libraries related to IPv6 networking. Build .Xr ppp 8 without support for network address translation (NAT). -.It Va NOATM +.It Va NO_ATM .Pq Vt bool Set to not build programs and libraries related to ATM networking. diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 1bc4c384660f..e15d480dd752 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -2,6 +2,7 @@ .if !defined(BURN_BRIDGES) .for oldnew in \ + NOATM:NO_ATM \ NOLIBC_R:NO_LIBC_R \ NOLIBPTHREAD:NO_LIBPTHREAD \ NOLIBTHR:NO_LIBTHR \ diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index ff6517ce1609..13665c014845 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -9,6 +9,7 @@ ____: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include .include .MAIN: all .endif !target(____) diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf index 224f2a542ffc..56c798da897d 100644 --- a/tools/tools/nanobsd/make.conf +++ b/tools/tools/nanobsd/make.conf @@ -8,7 +8,7 @@ # KERNCONF?=GENERIC NO_ACPI= -NOATM= +NO_ATM= NO_AUTHPF= NO_BLUETOOTH= NO_CVS= diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 4be12bcb671b..0f6bb9c5b167 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -230,7 +230,7 @@ SUBDIR= alias \ _truss= truss .endif -.if !defined(NOATM) +.if !defined(NO_ATM) _atm= atm .endif diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 47c1ac36ec6f..39ab303756db 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -188,7 +188,7 @@ SUBDIR= ac \ _sysinstall= sysinstall .endif -.if !defined(NOATM) +.if !defined(NO_ATM) _atm= atm .endif diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile index 6f5bd6a2a36a..8e8c21596d32 100644 --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd -.if !defined(NOATM) +.if !defined(NO_ATM) _snmp_atm= snmp_atm .endif diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 8e09aa0f9719..9b0ad5788e77 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -11,7 +11,7 @@ SRCS= acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \ WARNS?= 3 .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH -NOATM= +NO_ATM= NODES= NOI4B= NONAT= @@ -60,7 +60,7 @@ LDADD+= -lalias DPADD+= ${LIBALIAS} .endif -.if defined(NOATM) +.if defined(NO_ATM) CFLAGS+=-DNOATM .else SRCS+= atm.c