aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-09 09:03:37 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-09 09:03:37 +0000
commitdc8a6901eb43ea5e4bf37895d7ef61bb4732f214 (patch)
tree4b95f98bab0b298c5df171772b629d03400ef507 /archival
parent824c41ed6a1831100ce94c3622707a8a418ccfc9 (diff)
downloadbusybox-w32-dc8a6901eb43ea5e4bf37895d7ef61bb4732f214.tar.gz
busybox-w32-dc8a6901eb43ea5e4bf37895d7ef61bb4732f214.tar.bz2
busybox-w32-dc8a6901eb43ea5e4bf37895d7ef61bb4732f214.zip
- backout using features which are not available with the previous stable
version of make (3.71.1). git-svn-id: svn://busybox.net/trunk/busybox@14477 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival')
-rw-r--r--archival/Makefile.in8
-rw-r--r--archival/libunarchive/Makefile.in8
2 files changed, 12 insertions, 4 deletions
diff --git a/archival/Makefile.in b/archival/Makefile.in
index 6a2979e67..8a7b3bd4a 100644
--- a/archival/Makefile.in
+++ b/archival/Makefile.in
@@ -4,8 +4,8 @@
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
7srcdir=$(top_srcdir)/archival 7srcdir:=$(top_srcdir)/archival
8objdir=$(top_builddir)/archival 8objdir:=$(top_builddir)/archival
9 9
10ARCHIVAL-$(CONFIG_AR) += ar.o 10ARCHIVAL-$(CONFIG_AR) += ar.o
11ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o 11ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o
@@ -28,3 +28,7 @@ APPLET_SRC-a+=$(ARCHIVAL_SRC-a)
28 28
29archival_OBJ:= $(patsubst %,$(objdir)/%,$(ARCHIVAL-y)) 29archival_OBJ:= $(patsubst %,$(objdir)/%,$(ARCHIVAL-y))
30 30
31$(archival_OBJ): $(objdir)/%.o: $(srcdir)/%.c
32$(objdir)/archival.a: $(archival_OBJ)
33libraries-y:=$(libraries-y) $(objdir)/archival.a
34
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index 75d761036..d77aff736 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -4,8 +4,8 @@
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 6
7srcdir=$(top_srcdir)/archival/libunarchive 7srcdir:=$(top_srcdir)/archival/libunarchive
8objdir=$(top_builddir)/archival/libunarchive 8objdir:=$(top_builddir)/archival/libunarchive
9 9
10LIBUNARCHIVE-y:= \ 10LIBUNARCHIVE-y:= \
11\ 11\
@@ -71,3 +71,7 @@ LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a)
71 71
72archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y)) 72archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y))
73 73
74$(archival_libunarchive_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c
75$(objdir)/libunarchive.a: $(archival_libunarchive_OBJ$(os))
76libraries-y:=$(libraries-y) $(objdir)/libunarchive.a
77