diff options
author | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
commit | 6d6d18d45c145899fce3a39553771cf0af671f30 (patch) | |
tree | 1936d18cbf61b9e0989464aad0a11c52cbeff7b7 /libbb/Kbuild.src | |
parent | 0c204dc07b718244c360e0b84df66ce0a012e14f (diff) | |
parent | acb8be721768b54075a51d1859d390904a0f1f6c (diff) | |
download | busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.gz busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.bz2 busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.zip |
Merge branch 'busybox' into merge
Conflicts:
archival/libarchive/open_transformer.c
libbb/lineedit.c
miscutils/man.c
Diffstat (limited to 'libbb/Kbuild.src')
-rw-r--r-- | libbb/Kbuild.src | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 1f2ed36d9..1be87b337 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -189,3 +189,6 @@ lib-$(CONFIG_PGREP) += xregcomp.o | |||
189 | lib-$(CONFIG_PKILL) += xregcomp.o | 189 | lib-$(CONFIG_PKILL) += xregcomp.o |
190 | lib-$(CONFIG_DEVFSD) += xregcomp.o | 190 | lib-$(CONFIG_DEVFSD) += xregcomp.o |
191 | lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o | 191 | lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o |
192 | |||
193 | # Add the experimental logging functionality, only used by zcip | ||
194 | lib-$(CONFIG_ZCIP) += logenv.o | ||