aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2023-01-24 08:58:39 +0000
committerRon Yorston <rmy@pobox.com>2023-01-24 08:58:39 +0000
commit67c3e4c03f1dab1f840a81c2ce438d47ef8389f5 (patch)
tree988a297f0bd750c9dcb7adfd810c983a3b7434e0
parent1a88782fd33db4ad3531b63c9fb744c64282fee2 (diff)
downloadbusybox-w32-67c3e4c03f1dab1f840a81c2ce438d47ef8389f5.tar.gz
busybox-w32-67c3e4c03f1dab1f840a81c2ce438d47ef8389f5.tar.bz2
busybox-w32-67c3e4c03f1dab1f840a81c2ce438d47ef8389f5.zip
make: allow building as pdpmake only
Commit f261d2d27 (make: make + sh configuration) added 'pdpmake' as an alias for 'make'. It should have been possible to include 'pdpmake' in a build without also including 'make'. Adjust the build configuration so this works as intended.
-rw-r--r--miscutils/make.c1
-rw-r--r--win32/Kbuild1
2 files changed, 2 insertions, 0 deletions
diff --git a/miscutils/make.c b/miscutils/make.c
index bc84e8242..24e286aa9 100644
--- a/miscutils/make.c
+++ b/miscutils/make.c
@@ -34,6 +34,7 @@
34//applet:IF_PDPMAKE(APPLET_ODDNAME(pdpmake, make, BB_DIR_USR_BIN, BB_SUID_DROP, make)) 34//applet:IF_PDPMAKE(APPLET_ODDNAME(pdpmake, make, BB_DIR_USR_BIN, BB_SUID_DROP, make))
35 35
36//kbuild:lib-$(CONFIG_MAKE) += make.o 36//kbuild:lib-$(CONFIG_MAKE) += make.o
37//kbuild:lib-$(CONFIG_PDPMAKE) += make.o
37 38
38//usage:#define make_trivial_usage 39//usage:#define make_trivial_usage
39//usage: IF_FEATURE_MAKE_POSIX( 40//usage: IF_FEATURE_MAKE_POSIX(
diff --git a/win32/Kbuild b/win32/Kbuild
index 10614461a..ecd27645c 100644
--- a/win32/Kbuild
+++ b/win32/Kbuild
@@ -9,6 +9,7 @@ lib-$(CONFIG_PLATFORM_MINGW32) += env.o
9lib-$(CONFIG_PLATFORM_MINGW32) += fnmatch.o 9lib-$(CONFIG_PLATFORM_MINGW32) += fnmatch.o
10lib-$(CONFIG_PLATFORM_MINGW32) += fsync.o 10lib-$(CONFIG_PLATFORM_MINGW32) += fsync.o
11lib-$(CONFIG_MAKE) += glob.o 11lib-$(CONFIG_MAKE) += glob.o
12lib-$(CONFIG_PDPMAKE) += glob.o
12lib-$(CONFIG_PLATFORM_MINGW32) += inet_pton.o 13lib-$(CONFIG_PLATFORM_MINGW32) += inet_pton.o
13lib-$(CONFIG_PLATFORM_MINGW32) += ioctl.o 14lib-$(CONFIG_PLATFORM_MINGW32) += ioctl.o
14lib-$(CONFIG_FEATURE_PRNG_ISAAC) += isaac.o 15lib-$(CONFIG_FEATURE_PRNG_ISAAC) += isaac.o