diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
commit | 5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf (patch) | |
tree | 233c051da862595b6e473e832051708e2d9803cb /archival | |
parent | 12c2429a4242a157217c5bc9673a531fa1e1de61 (diff) | |
download | busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.gz busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.bz2 busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.zip |
- fixes parallel builds (make -j)
- use less resources for the buildsystem itself
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 ee284ad7a..6a2979e67 100644 --- a/archival/Makefile.in +++ b/archival/Makefile.in | |||
@@ -4,14 +4,9 @@ | |||
4 | # | 4 | # |
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
6 | 6 | ||
7 | ARCHIVAL_AR:=archival.a | ||
8 | ifndef $(ARCHIVAL_DIR) | ||
9 | ARCHIVAL_DIR:=$(top_builddir)/archival/ | ||
10 | endif | ||
11 | srcdir=$(top_srcdir)/archival | 7 | srcdir=$(top_srcdir)/archival |
8 | objdir=$(top_builddir)/archival | ||
12 | 9 | ||
13 | ARCHIVAL-y:= | ||
14 | ARCHIVAL-$(CONFIG_APT_GET) += | ||
15 | ARCHIVAL-$(CONFIG_AR) += ar.o | 10 | ARCHIVAL-$(CONFIG_AR) += ar.o |
16 | ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o | 11 | ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o |
17 | ARCHIVAL-$(CONFIG_UNLZMA) += unlzma.o | 12 | ARCHIVAL-$(CONFIG_UNLZMA) += unlzma.o |
@@ -26,17 +21,10 @@ ARCHIVAL-$(CONFIG_TAR) += tar.o | |||
26 | ARCHIVAL-$(CONFIG_UNCOMPRESS) += uncompress.o | 21 | ARCHIVAL-$(CONFIG_UNCOMPRESS) += uncompress.o |
27 | ARCHIVAL-$(CONFIG_UNZIP) += unzip.o | 22 | ARCHIVAL-$(CONFIG_UNZIP) += unzip.o |
28 | 23 | ||
29 | ifneq ($(strip $(ARCHIVAL-y)),) | ||
30 | libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR) | ||
31 | endif | ||
32 | |||
33 | ARCHIVAL_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(ARCHIVAL-y)) | 24 | ARCHIVAL_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(ARCHIVAL-y)) |
34 | ARCHIVAL_SRC-a:=$(wildcard $(srcdir)/*.c) | 25 | ARCHIVAL_SRC-a:=$(wildcard $(srcdir)/*.c) |
35 | APPLET_SRC-y+=$(ARCHIVAL_SRC-y) | 26 | APPLET_SRC-y+=$(ARCHIVAL_SRC-y) |
36 | APPLET_SRC-a+=$(ARCHIVAL_SRC-a) | 27 | APPLET_SRC-a+=$(ARCHIVAL_SRC-a) |
37 | 28 | ||
38 | $(ARCHIVAL_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y)) | 29 | archival_OBJ:= $(patsubst %,$(objdir)/%,$(ARCHIVAL-y)) |
39 | $(do_ar) | ||
40 | 30 | ||
41 | $(ARCHIVAL_DIR)%.o: $(srcdir)/%.c | ||
42 | $(compile.c) | ||
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in index 265079c10..75d761036 100644 --- a/archival/libunarchive/Makefile.in +++ b/archival/libunarchive/Makefile.in | |||
@@ -3,83 +3,71 @@ | |||
3 | # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | 3 | # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> |
4 | # | 4 | # |
5 | # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
6 | # | ||
7 | 6 | ||
8 | LIBUNARCHIVE_AR:=libunarchive.a | ||
9 | ifndef $(LIBUNARCHIVE_DIR) | ||
10 | LIBUNARCHIVE_DIR:=$(top_builddir)/archival/libunarchive | ||
11 | endif | ||
12 | srcdir=$(top_srcdir)/archival/libunarchive | 7 | srcdir=$(top_srcdir)/archival/libunarchive |
13 | 8 | objdir=$(top_builddir)/archival/libunarchive | |
14 | LIBUNARCHIVE-obj:=$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR) | ||
15 | LIBUNARCHIVE-pic:=$(LIBUNARCHIVE_DIR)/$(subst .a,-pic.a,$(LIBUNARCHIVE_AR)) | ||
16 | |||
17 | libraries-y+=$(LIBUNARCHIVE-obj) | ||
18 | 9 | ||
19 | LIBUNARCHIVE-y:= \ | 10 | LIBUNARCHIVE-y:= \ |
20 | \ | 11 | \ |
21 | data_skip.o \ | 12 | data_skip \ |
22 | data_extract_all.o \ | 13 | data_extract_all \ |
23 | data_extract_to_stdout.o \ | 14 | data_extract_to_stdout \ |
24 | data_extract_to_buffer.o \ | 15 | data_extract_to_buffer \ |
25 | \ | 16 | \ |
26 | filter_accept_all.o \ | 17 | filter_accept_all \ |
27 | filter_accept_list.o \ | 18 | filter_accept_list \ |
28 | filter_accept_reject_list.o \ | 19 | filter_accept_reject_list \ |
29 | \ | 20 | \ |
30 | header_skip.o \ | 21 | header_skip \ |
31 | header_list.o \ | 22 | header_list \ |
32 | header_verbose_list.o \ | 23 | header_verbose_list \ |
33 | \ | 24 | \ |
34 | archive_xread_all.o \ | 25 | archive_xread_all \ |
35 | archive_xread_all_eof.o \ | 26 | archive_xread_all_eof \ |
36 | \ | 27 | \ |
37 | seek_by_char.o \ | 28 | seek_by_char \ |
38 | seek_by_jump.o \ | 29 | seek_by_jump \ |
39 | \ | 30 | \ |
40 | data_align.o \ | 31 | data_align \ |
41 | find_list_entry.o \ | 32 | find_list_entry \ |
42 | open_transformer.o \ | 33 | open_transformer \ |
43 | init_handle.o | 34 | init_handle |
44 | 35 | ||
45 | GUNZIP_FILES:= check_header_gzip.o decompress_unzip.o | 36 | GUNZIP_FILES:= check_header_gzip decompress_unzip |
46 | DPKG_FILES:= \ | 37 | DPKG_FILES:= \ |
47 | get_header_ar.o \ | 38 | get_header_ar \ |
48 | unpack_ar_archive.o \ | 39 | unpack_ar_archive \ |
49 | get_header_tar.o \ | 40 | get_header_tar \ |
50 | filter_accept_list_reassign.o | 41 | filter_accept_list_reassign |
51 | 42 | ||
52 | LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o | 43 | LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar unpack_ar_archive |
53 | LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o | 44 | LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2 |
54 | LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma.o | 45 | LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma |
55 | LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio.o | 46 | LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio |
56 | LIBUNARCHIVE-$(CONFIG_DPKG) += $(DPKG_FILES) | 47 | LIBUNARCHIVE-$(CONFIG_DPKG) += $(DPKG_FILES) |
57 | LIBUNARCHIVE-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) | 48 | LIBUNARCHIVE-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) |
58 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o | 49 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz |
59 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o | 50 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2 get_header_tar_bz2 |
60 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o | 51 | LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma get_header_tar_lzma |
61 | LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) | 52 | LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) |
62 | LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o | 53 | LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress |
63 | LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o | 54 | LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio |
64 | LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o | 55 | LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio |
65 | LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o | 56 | LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar |
66 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o | 57 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2 get_header_tar_bz2 |
67 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o | 58 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma get_header_tar_lzma |
68 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o | 59 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz |
69 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o | 60 | LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress |
70 | LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o | 61 | LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress |
71 | LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES) | 62 | LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES) |
72 | 63 | ||
73 | 64 | ||
74 | LIBUNARCHIVE-y:=$(sort $(LIBUNARCHIVE-y)) | 65 | LIBUNARCHIVE-y:=$(sort $(LIBUNARCHIVE-y)) |
75 | 66 | ||
76 | LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBUNARCHIVE-y))) | 67 | LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBUNARCHIVE-y)) |
77 | LIBUNARCHIVE_SRC-a:=$(wildcard $(srcdir)/*.c) | 68 | LIBUNARCHIVE_SRC-a:=$(wildcard $(srcdir)/*.c) |
78 | LIBRARY_SRC-y+=$(LIBUNARCHIVE_SRC-y) | 69 | LIBRARY_SRC-y+=$(LIBUNARCHIVE_SRC-y) |
79 | LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a) | 70 | LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a) |
80 | 71 | ||
81 | $(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)/%,$(LIBUNARCHIVE-y)) | 72 | archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y)) |
82 | $(do_ar) | ||
83 | 73 | ||
84 | $(LIBUNARCHIVE_DIR)/%.o: $(srcdir)/%.c | ||
85 | $(compile.c) | ||