diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /libbb/Kbuild.src | |
parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'libbb/Kbuild.src')
-rw-r--r-- | libbb/Kbuild.src | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index b5e9afc78..4cb063f89 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -168,6 +168,12 @@ lib-$(CONFIG_IOSTAT) += get_cpu_count.o | |||
168 | lib-$(CONFIG_MPSTAT) += get_cpu_count.o | 168 | lib-$(CONFIG_MPSTAT) += get_cpu_count.o |
169 | lib-$(CONFIG_POWERTOP) += get_cpu_count.o | 169 | lib-$(CONFIG_POWERTOP) += get_cpu_count.o |
170 | 170 | ||
171 | lib-$(CONFIG_PING) += inet_cksum.o | ||
172 | lib-$(CONFIG_TRACEROUTE) += inet_cksum.o | ||
173 | lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o | ||
174 | lib-$(CONFIG_UDHCPC) += inet_cksum.o | ||
175 | lib-$(CONFIG_UDHCPD) += inet_cksum.o | ||
176 | |||
171 | # We shouldn't build xregcomp.c if we don't need it - this ensures we don't | 177 | # We shouldn't build xregcomp.c if we don't need it - this ensures we don't |
172 | # require regex.h to be in the include dir even if we don't need it thereby | 178 | # require regex.h to be in the include dir even if we don't need it thereby |
173 | # allowing us to build busybox even if uclibc regex support is disabled. | 179 | # allowing us to build busybox even if uclibc regex support is disabled. |