diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
| -rw-r--r-- | usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 8 | ||||
| -rw-r--r-- | usr.bin/make/Makefile | 2 |
5 files changed, 1 insertions, 20 deletions
@@ -139,11 +139,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ # Choices add to complexity though. # We cannot blindly use a make which may not be the one we want # so be exlicit - until all choice is removed. -.if !defined(WITHOUT_BMAKE) WANT_MAKE= bmake -.else -WANT_MAKE= fmake -.endif MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} .if defined(.PARSEDIR) HAVE_MAKE= bmake @@ -152,7 +148,7 @@ HAVE_MAKE= fmake .endif .if exists(${MYMAKE}) SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk -.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +.elif ${WANT_MAKE} != ${HAVE_MAKE} # It may not exist yet but we may cause it to. # In the case of fmake, upgrade_checks may cause a newer version to be built. SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 2b0d41f..1b36431 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -65,7 +65,6 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ - BMAKE \ BOOT \ BSD_CPIO \ BSNMP \ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 694a8d0..6df995a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -279,11 +279,7 @@ SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" -.if ${MK_BMAKE} != "no" SUBDIR+= bmake -.else -SUBDIR+= make -.endif .endif .if ${MK_MAN_UTILS} != "no" diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index b8e27e0..b2a8e41 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -7,15 +7,7 @@ .export SRCTOP .endif -# Sadly, we cannot assume src.opts.mk did its job, -# nor can we safely include the one we want -.if !defined(WITHOUT_BMAKE) -MK_BMAKE= yes -.endif - -.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" PROG= make -.endif .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 27b2957..bd9d58d 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -111,12 +111,10 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\" .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .endif -.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" # if we are here we don't want this called 'make' PROG= fmake fmake.1: make.1 cp ${.ALLSRC} ${.TARGET} -.endif .if ${MK_TESTS} != "no" SUBDIR+= tests |
