diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /libbb/Kbuild.src | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'libbb/Kbuild.src')
| -rw-r--r-- | libbb/Kbuild.src | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index f815c6dbc..3c9493f7e 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
| @@ -115,12 +115,13 @@ lib-$(CONFIG_PLATFORM_POSIX) += inet_common.o | |||
| 115 | lib-$(CONFIG_PLATFORM_POSIX) += kernel_version.o | 115 | lib-$(CONFIG_PLATFORM_POSIX) += kernel_version.o |
| 116 | lib-$(CONFIG_PLATFORM_POSIX) += login.o | 116 | lib-$(CONFIG_PLATFORM_POSIX) += login.o |
| 117 | lib-$(CONFIG_PLATFORM_POSIX) += makedev.o | 117 | lib-$(CONFIG_PLATFORM_POSIX) += makedev.o |
| 118 | lib-$(CONFIG_PLATFORM_POSIX) += match_fstype.o | ||
| 119 | lib-$(CONFIG_PLATFORM_POSIX) += read_key.o | 118 | lib-$(CONFIG_PLATFORM_POSIX) += read_key.o |
| 120 | lib-$(CONFIG_PLATFORM_POSIX) += signals.o | 119 | lib-$(CONFIG_PLATFORM_POSIX) += signals.o |
| 121 | lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o | 120 | lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o |
| 122 | lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o | 121 | lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o |
| 123 | 122 | ||
| 123 | lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o | ||
| 124 | |||
| 124 | lib-$(CONFIG_FEATURE_UTMP) += utmp.o | 125 | lib-$(CONFIG_FEATURE_UTMP) += utmp.o |
| 125 | 126 | ||
| 126 | # A mix of optimizations (why build stuff we know won't be used) | 127 | # A mix of optimizations (why build stuff we know won't be used) |