diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
| commit | b8f278ee745778806118f57fb7884d205eba05ad (patch) | |
| tree | fef237f6dd302c59918cf389a60c120e58d3e086 /libbb/Kbuild.src | |
| parent | 3fd34651ea72ea1c335d3170f234cb0517fd897f (diff) | |
| parent | 57434022cefde87133b8ad39fb3b79c1274e7684 (diff) | |
| download | busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.gz busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.bz2 busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.zip | |
Merge branch 'busybox' into merge
Conflicts:
archival/Config.src
shell/ash.c
Diffstat (limited to 'libbb/Kbuild.src')
| -rw-r--r-- | libbb/Kbuild.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index db79ff62b..adaab92d6 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
| @@ -146,7 +146,7 @@ lib-$(CONFIG_DELUSER) += update_passwd.o | |||
| 146 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o | 146 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o |
| 147 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o | 147 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o |
| 148 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o | 148 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o |
| 149 | lib-$(CONFIG_SULOGIN) += pw_encrypt.o | 149 | lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o |
| 150 | lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o | 150 | lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o |
| 151 | lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o | 151 | lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o |
| 152 | lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o | 152 | lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o |