As we no longer use function pointers for read in common archiving code

[oweals/busybox.git] / archival / libunarchive / Makefile.in

diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index cd68be732e2ccca267bf7e3ba07304f219979795..09b0571edd5bc97edccc4288c15cd14d1e4390f2 100644 (file)
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,14 +22,56 @@ ifndef $(LIBUNARCHIVE_DIR)
 LIBUNARCHIVE_DIR:=$(TOPDIR)archival/libunarchive/
 endif
 
-LIBUNARCHIVE-y:=unarchive.o seek_sub_file.o
-LIBUNARCHIVE-$(CONFIG_DPKG) += deb_extract.o get_header_ar.o get_header_tar.o
-LIBUNARCHIVE-$(CONFIG_DPKG_DEB) += deb_extract.o get_header_ar.o get_header_tar.o
-LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o
+LIBUNARCHIVE-y:= \
+\
+       data_skip.o \
+       data_extract_all.o \
+       data_extract_to_stdout.o \
+       data_extract_to_buffer.o \
+\
+       filter_accept_all.o \
+       filter_accept_list.o \
+       filter_accept_reject_list.o \
+\
+       header_skip.o \
+       header_list.o \
+       header_verbose_list.o \
+\
+       archive_xread_all.o \
+       archive_xread_all_eof.o \
+\
+       seek_by_char.o \
+       seek_by_jump.o \
+\
+       data_align.o \
+       find_list_entry.o \
+       open_transformer.o \
+       init_handle.o
+
+GUNZIP_FILES:= check_header_gzip.o unzip.o
+DPKG_FILES:= \
+       get_header_ar.o \
+       unpack_ar_archive.o \
+       get_header_tar.o \
+       filter_accept_list_reassign.o
+
+LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o 
+LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
 LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio.o
-LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += get_header_cpio.o
+LIBUNARCHIVE-$(CONFIG_DPKG) += $(DPKG_FILES)
+LIBUNARCHIVE-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
+LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
+LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
+LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += uncompress.o
+LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o 
+LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
 LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o
-LIBUNARCHIVE-$(CONFIG_UNZIP) += get_header_zip.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += uncompress.o
+LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += uncompress.o
+LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
 
 libraries-y+=$(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR)