From 66620fa62691271d777d11c562f894c65cd4f094 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 14 Nov 2013 09:53:52 +0100 Subject: archival/*: move "kbuild:" snippets into .c files Signed-off-by: Denys Vlasenko --- archival/bbunzip.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'archival/bbunzip.c') diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 3735e3282..f2d796e67 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -7,6 +7,9 @@ #include "libbb.h" #include "bb_archive.h" +/* lzop_main() uses bbunpack(), need this: */ +//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o + /* Note: must be kept in sync with archival/lzop.c */ enum { OPT_STDOUT = 1 << 0, @@ -205,7 +208,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - //usage:#define uncompress_trivial_usage //usage: "[-cf] [FILE]..." //usage:#define uncompress_full_usage "\n\n" @@ -213,6 +215,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) //usage: "\n -c Write to stdout" //usage: "\n -f Overwrite" +//kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o #if ENABLE_UNCOMPRESS static IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_aux_data_t *aux) @@ -257,7 +260,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) * See the license_msg below and the file COPYING for the software license. * See the file algorithm.doc for the compression algorithms and file formats. */ - //usage:#define gunzip_trivial_usage //usage: "[-cft] [FILE]..." //usage:#define gunzip_full_usage "\n\n" @@ -278,6 +280,8 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) //usage:#define zcat_full_usage "\n\n" //usage: "Decompress to stdout" +//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o +//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o #if ENABLE_GUNZIP static char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM) @@ -356,8 +360,11 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) //usage: "[FILE]..." //usage:#define bzcat_full_usage "\n\n" //usage: "Decompress to stdout" + //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) +//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o +//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o #if ENABLE_BUNZIP2 static IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux) @@ -385,7 +392,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) * * Licensed under GPLv2, see file LICENSE in this source tree. */ - //usage:#define unlzma_trivial_usage //usage: "[-cf] [FILE]..." //usage:#define unlzma_full_usage "\n\n" @@ -426,6 +432,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //usage:#define xzcat_full_usage "\n\n" //usage: "Decompress to stdout" +//kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o #if ENABLE_UNLZMA static IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux) @@ -451,6 +458,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) #endif +//kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o #if ENABLE_UNXZ static IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux) -- cgit v1.2.3