diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
| commit | 63dbf1908bc51918d9d963f4d9b7657306b2970d (patch) | |
| tree | 781ebfdcbbb953688e06f3541ce9e0c71f1dadfa /libbb/Kbuild.src | |
| parent | 06900749637b925af1ebdf5030ba03a379f4f84f (diff) | |
| parent | 6968e081230fb6434a2a6f0eed39d538ea982f3f (diff) | |
| download | busybox-w32-63dbf1908bc51918d9d963f4d9b7657306b2970d.tar.gz busybox-w32-63dbf1908bc51918d9d963f4d9b7657306b2970d.tar.bz2 busybox-w32-63dbf1908bc51918d9d963f4d9b7657306b2970d.zip | |
Merge commit '1_23_0' into mergeTIG_1_23_0
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'libbb/Kbuild.src')
| -rw-r--r-- | libbb/Kbuild.src | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 1be87b337..d94b65008 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
| @@ -144,6 +144,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o | |||
| 144 | lib-$(CONFIG_DELGROUP) += update_passwd.o | 144 | lib-$(CONFIG_DELGROUP) += update_passwd.o |
| 145 | lib-$(CONFIG_DELUSER) += update_passwd.o | 145 | lib-$(CONFIG_DELUSER) += update_passwd.o |
| 146 | 146 | ||
| 147 | lib-$(CONFIG_FTPD) += correct_password.o | ||
| 147 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o | 148 | lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o |
| 148 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o | 149 | lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o |
| 149 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o | 150 | lib-$(CONFIG_CRYPTPW) += pw_encrypt.o |