9 files changed, 3 insertions, 73 deletions

diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index a0edb123d..e49d38538 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -19,8 +19,7 @@ lib-$(CONFIG_RPM)		+= rpm.o
 lib-$(CONFIG_TAR)               += tar.o
 lib-$(CONFIG_UNZIP)             += unzip.o
 
-lib-$(CONFIG_LZOP)              += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
-lib-$(CONFIG_LZOP_COMPR_HIGH)   += lzo1x_9x.o
+lib-$(CONFIG_LZOP)              += lzop.o bbunzip.o
 lib-$(CONFIG_GZIP)              += gzip.o bbunzip.o
 lib-$(CONFIG_BZIP2)             += bzip2.o bbunzip.o
 
diff --git a/archival/liblzo_interface.h b/archival/liblzo_interface.h
deleted file mode 100644
index 9a84c0b6b..000000000
--- a/archival/liblzo_interface.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1996..2008 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   Markus F.X.J. Oberhumer <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#define LZO1X
-#undef LZO1Y
-
-#undef assert
-/*
-static void die_at(int line)
-{
-        bb_error_msg_and_die("internal error at %d", line);
-}
-#define assert(v) if (!(v)) die_at(__LINE__)
-*/
-#define assert(v) ((void)0)
-
-int lzo1x_1_compress(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem);
-int lzo1x_1_15_compress(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem);
-int lzo1x_999_compress_level(const uint8_t* in, unsigned in_len,
-                uint8_t* out, unsigned* out_len,
-                void* wrkmem,
-                int compression_level);
-
-/* decompression */
-//int lzo1x_decompress(const uint8_t* src, unsigned src_len,
-//              uint8_t* dst, unsigned* dst_len,
-//              void* wrkmem /* NOT USED */);
-/* safe decompression with overrun testing */
-int lzo1x_decompress_safe(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem /* NOT USED */);
-
-#define LZO_E_OK                    0
-#define LZO_E_ERROR                 (-1)
-#define LZO_E_OUT_OF_MEMORY         (-2)    /* [not used right now] */
-#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* [not used right now] */
-#define LZO_E_INPUT_OVERRUN         (-4)
-#define LZO_E_OUTPUT_OVERRUN        (-5)
-#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
-#define LZO_E_EOF_NOT_FOUND         (-7)
-#define LZO_E_INPUT_NOT_CONSUMED    (-8)
-#define LZO_E_NOT_YET_IMPLEMENTED   (-9)    /* [not used right now] */
-
-/* lzo-2.03/include/lzo/lzoconf.h */
-#define LZO_VERSION   0x2030
diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src
index e92b4aad2..b0bc4e5aa 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libunarchive/Kbuild.src
@@ -48,6 +48,8 @@ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
 lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += decompress_unzip.o
+lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_unzip.o get_header_tar_gz.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o get_header_tar_bz2.o
diff --git a/archival/liblzo.h b/archival/libunarchive/liblzo.h
index 843997cb9..843997cb9 100644
--- a/archival/liblzo.h
+++ b/archival/libunarchive/liblzo.h
diff --git a/archival/lzo1x_1.c b/archival/libunarchive/lzo1x_1.c
index a88839846..a88839846 100644
--- a/archival/lzo1x_1.c
+++ b/archival/libunarchive/lzo1x_1.c
diff --git a/archival/lzo1x_1o.c b/archival/libunarchive/lzo1x_1o.c
index 3c61253e0..3c61253e0 100644
--- a/archival/lzo1x_1o.c
+++ b/archival/libunarchive/lzo1x_1o.c
diff --git a/archival/lzo1x_9x.c b/archival/libunarchive/lzo1x_9x.c
index 483205155..483205155 100644
--- a/archival/lzo1x_9x.c
+++ b/archival/libunarchive/lzo1x_9x.c
diff --git a/archival/lzo1x_c.c b/archival/libunarchive/lzo1x_c.c
index cc86f74b1..cc86f74b1 100644
--- a/archival/lzo1x_c.c
+++ b/archival/libunarchive/lzo1x_c.c
diff --git a/archival/lzo1x_d.c b/archival/libunarchive/lzo1x_d.c
index 348a85510..348a85510 100644
--- a/archival/lzo1x_d.c
+++ b/archival/libunarchive/lzo1x_d.c