diff options
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/Makefile.in | 16 | ||||
| -rw-r--r-- | archival/libunarchive/Makefile.in | 96 |
2 files changed, 44 insertions, 68 deletions
diff --git a/archival/Makefile.in b/archival/Makefile.in index ee284ad..6a2979e 100644 --- a/archival/Makefile.in +++ b/archival/Makefile.in @@ -4,14 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -ARCHIVAL_AR:=archival.a -ifndef $(ARCHIVAL_DIR) -ARCHIVAL_DIR:=$(top_builddir)/archival/ -endif srcdir=$(top_srcdir)/archival +objdir=$(top_builddir)/archival -ARCHIVAL-y:= -ARCHIVAL-$(CONFIG_APT_GET) += ARCHIVAL-$(CONFIG_AR) += ar.o ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o ARCHIVAL-$(CONFIG_UNLZMA) += unlzma.o @@ -26,17 +21,10 @@ 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_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y)) - $(do_ar) +archival_OBJ:= $(patsubst %,$(objdir)/%,$(ARCHIVAL-y)) -$(ARCHIVAL_DIR)%.o: $(srcdir)/%.c - $(compile.c) diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in index 265079c..75d7610 100644 --- a/archival/libunarchive/Makefile.in +++ b/archival/libunarchive/Makefile.in @@ -3,83 +3,71 @@ # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -# -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) -LIBUNARCHIVE-pic:=$(LIBUNARCHIVE_DIR)/$(subst .a,-pic.a,$(LIBUNARCHIVE_AR)) - -libraries-y+=$(LIBUNARCHIVE-obj) +objdir=$(top_builddir)/archival/libunarchive LIBUNARCHIVE-y:= \ \ - data_skip.o \ - data_extract_all.o \ - data_extract_to_stdout.o \ - data_extract_to_buffer.o \ + data_skip \ + data_extract_all \ + data_extract_to_stdout \ + data_extract_to_buffer \ \ - filter_accept_all.o \ - filter_accept_list.o \ - filter_accept_reject_list.o \ + filter_accept_all \ + filter_accept_list \ + filter_accept_reject_list \ \ - header_skip.o \ - header_list.o \ - header_verbose_list.o \ + header_skip \ + header_list \ + header_verbose_list \ \ - archive_xread_all.o \ - archive_xread_all_eof.o \ + archive_xread_all \ + archive_xread_all_eof \ \ - seek_by_char.o \ - seek_by_jump.o \ + seek_by_char \ + seek_by_jump \ \ - data_align.o \ - find_list_entry.o \ - open_transformer.o \ - init_handle.o + data_align \ + find_list_entry \ + open_transformer \ + init_handle -GUNZIP_FILES:= check_header_gzip.o decompress_unzip.o +GUNZIP_FILES:= check_header_gzip decompress_unzip DPKG_FILES:= \ - get_header_ar.o \ - unpack_ar_archive.o \ - get_header_tar.o \ - filter_accept_list_reassign.o + get_header_ar \ + unpack_ar_archive \ + get_header_tar \ + filter_accept_list_reassign -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_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_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_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o +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_GUNZIP) += $(GUNZIP_FILES) -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_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_UNZIP) += $(GUNZIP_FILES) LIBUNARCHIVE-y:=$(sort $(LIBUNARCHIVE-y)) -LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBUNARCHIVE-y))) +LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBUNARCHIVE-y)) LIBUNARCHIVE_SRC-a:=$(wildcard $(srcdir)/*.c) LIBRARY_SRC-y+=$(LIBUNARCHIVE_SRC-y) LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a) -$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)/%,$(LIBUNARCHIVE-y)) - $(do_ar) +archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y)) -$(LIBUNARCHIVE_DIR)/%.o: $(srcdir)/%.c - $(compile.c) |