2 files changed, 68 insertions, 54 deletions

diff --git a/archival/Makefile.in b/archival/Makefile.in
index 8a7b3bd4a..ee284ad7a 100644
--- a/archival/Makefile.in
+++ b/archival/Makefile.in
@@ -4,9 +4,14 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
-srcdir:=$(top_srcdir)/archival
-objdir:=$(top_builddir)/archival
+ARCHIVAL_AR:=archival.a
+ifndef $(ARCHIVAL_DIR)
+ARCHIVAL_DIR:=$(top_builddir)/archival/
+endif
+srcdir=$(top_srcdir)/archival
 
+ARCHIVAL-y:=
+ARCHIVAL-$(CONFIG_APT_GET)      +=
 ARCHIVAL-$(CONFIG_AR)           += ar.o
 ARCHIVAL-$(CONFIG_BUNZIP2)      += bunzip2.o
 ARCHIVAL-$(CONFIG_UNLZMA)       += unlzma.o
@@ -21,14 +26,17 @@ ARCHIVAL-$(CONFIG_TAR)		+= tar.o
 ARCHIVAL-$(CONFIG_UNCOMPRESS)   += uncompress.o
 ARCHIVAL-$(CONFIG_UNZIP)        += unzip.o
 
+ifneq ($(strip $(ARCHIVAL-y)),)
+libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR)
+endif
+
 ARCHIVAL_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(ARCHIVAL-y))
 ARCHIVAL_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(ARCHIVAL_SRC-y)
 APPLET_SRC-a+=$(ARCHIVAL_SRC-a)
 
-archival_OBJ:=  $(patsubst %,$(objdir)/%,$(ARCHIVAL-y))
-
-$(archival_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/archival.a: $(archival_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/archival.a
+$(ARCHIVAL_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
+        $(do_ar)
 
+$(ARCHIVAL_DIR)%.o: $(srcdir)/%.c
+        $(compile.c)
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index d77aff736..9bb91563d 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -4,74 +4,80 @@
 #
 # Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 
-srcdir:=$(top_srcdir)/archival/libunarchive
-objdir:=$(top_builddir)/archival/libunarchive
+LIBUNARCHIVE_AR:=libunarchive.a
+ifndef $(LIBUNARCHIVE_DIR)
+LIBUNARCHIVE_DIR:=$(top_builddir)/archival/libunarchive
+endif
+srcdir=$(top_srcdir)/archival/libunarchive
+
+LIBUNARCHIVE-obj:=$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR)
+
+libraries-y+=$(LIBUNARCHIVE-obj)
 
 LIBUNARCHIVE-y:= \
 \
-        data_skip \
-        data_extract_all \
-        data_extract_to_stdout \
-        data_extract_to_buffer \
+        data_skip.o \
+        data_extract_all.o \
+        data_extract_to_stdout.o \
+        data_extract_to_buffer.o \
 \
-        filter_accept_all \
-        filter_accept_list \
-        filter_accept_reject_list \
+        filter_accept_all.o \
+        filter_accept_list.o \
+        filter_accept_reject_list.o \
 \
-        header_skip \
-        header_list \
-        header_verbose_list \
+        header_skip.o \
+        header_list.o \
+        header_verbose_list.o \
 \
-        archive_xread_all \
-        archive_xread_all_eof \
+        archive_xread_all.o \
+        archive_xread_all_eof.o \
 \
-        seek_by_char \
-        seek_by_jump \
+        seek_by_char.o \
+        seek_by_jump.o \
 \
-        data_align \
-        find_list_entry \
-        open_transformer \
-        init_handle
+        data_align.o \
+        find_list_entry.o \
+        open_transformer.o \
+        init_handle.o
 
-GUNZIP_FILES:= check_header_gzip decompress_unzip
+GUNZIP_FILES:= check_header_gzip.o decompress_unzip.o
 DPKG_FILES:= \
-        get_header_ar \
-        unpack_ar_archive \
-        get_header_tar \
-        filter_accept_list_reassign
+        get_header_ar.o \
+        unpack_ar_archive.o \
+        get_header_tar.o \
+        filter_accept_list_reassign.o
 
-LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar unpack_ar_archive
-LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2
-LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma
-LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio
+LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
+LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
+LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma.o
+LIBUNARCHIVE-$(CONFIG_CPIO) += 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
-LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2 get_header_tar_bz2
-LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma get_header_tar_lzma
+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_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
 LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
-LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress
-LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio
-LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio
-LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar
-LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2 get_header_tar_bz2
-LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma get_header_tar_lzma
-LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz
-LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress
-LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress
+LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_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_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
+LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
+LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
 LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
 
 
 LIBUNARCHIVE-y:=$(sort $(LIBUNARCHIVE-y))
 
-LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBUNARCHIVE-y))
+LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBUNARCHIVE-y)))
 LIBUNARCHIVE_SRC-a:=$(wildcard $(srcdir)/*.c)
 LIBRARY_SRC-y+=$(LIBUNARCHIVE_SRC-y)
 LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a)
 
-archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y))
-
-$(archival_libunarchive_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c
-$(objdir)/libunarchive.a: $(archival_libunarchive_OBJ$(os))
-libraries-y:=$(libraries-y) $(objdir)/libunarchive.a
+$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)/%,$(LIBUNARCHIVE-y))
+        $(do_ar)
 
+$(LIBUNARCHIVE_DIR)/%.o: $(srcdir)/%.c
+        $(compile.c)