diff options
| author | Bernhard Reutner-Fischer | 2006-03-13 19:04:00 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2006-03-13 19:04:00 +0000 |
| commit | df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch) | |
| tree | 49493696039b285aa751a5bc884fc70c9c85e878 /archival/Makefile.in | |
| parent | c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff) | |
| download | busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz | |
- revert back to r14406
Diffstat (limited to 'archival/Makefile.in')
| -rw-r--r-- | archival/Makefile.in | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/archival/Makefile.in b/archival/Makefile.in index 8a7b3bd..ee284ad 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) |