diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /libbb/Kbuild.src | |
parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'libbb/Kbuild.src')
-rw-r--r-- | libbb/Kbuild.src | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index d110a3265..fcab184e0 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -57,9 +57,7 @@ lib-y += hash_md5_sha.o | |||
57 | #lib-y += hash_md5prime.o | 57 | #lib-y += hash_md5prime.o |
58 | lib-y += messages.o | 58 | lib-y += messages.o |
59 | lib-y += mode_string.o | 59 | lib-y += mode_string.o |
60 | lib-y += obscure.o | ||
61 | lib-y += parse_mode.o | 60 | lib-y += parse_mode.o |
62 | lib-y += parse_config.o | ||
63 | lib-y += perror_msg.o | 61 | lib-y += perror_msg.o |
64 | lib-y += perror_nomsg.o | 62 | lib-y += perror_nomsg.o |
65 | lib-y += perror_nomsg_and_die.o | 63 | lib-y += perror_nomsg_and_die.o |
@@ -138,7 +136,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o | |||
138 | lib-$(CONFIG_DELGROUP) += update_passwd.o | 136 | lib-$(CONFIG_DELGROUP) += update_passwd.o |
139 | lib-$(CONFIG_DELUSER) += update_passwd.o | 137 | lib-$(CONFIG_DELUSER) += update_passwd.o |
140 | 138 | ||
141 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o | 139 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o |
142 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o | 140 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o |
143 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o | 141 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o |
144 | lib-$(CONFIG_SULOGIN) += pw_encrypt.o | 142 | lib-$(CONFIG_SULOGIN) += pw_encrypt.o |