diff options
author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-09 09:03:37 +0000 |
---|---|---|
committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-09 09:03:37 +0000 |
commit | dc8a6901eb43ea5e4bf37895d7ef61bb4732f214 (patch) | |
tree | 4b95f98bab0b298c5df171772b629d03400ef507 /coreutils | |
parent | 824c41ed6a1831100ce94c3622707a8a418ccfc9 (diff) | |
download | busybox-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 'coreutils')
-rw-r--r-- | coreutils/Makefile.in | 8 | ||||
-rw-r--r-- | coreutils/libcoreutils/Makefile.in | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in index 5f8a0ac52..73581f2aa 100644 --- a/coreutils/Makefile.in +++ b/coreutils/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 | ||
7 | srcdir=$(top_srcdir)/coreutils | 7 | srcdir:=$(top_srcdir)/coreutils |
8 | objdir=$(top_builddir)/coreutils | 8 | objdir:=$(top_builddir)/coreutils |
9 | 9 | ||
10 | COREUTILS-$(CONFIG_BASENAME) += basename.o | 10 | COREUTILS-$(CONFIG_BASENAME) += basename.o |
11 | COREUTILS-$(CONFIG_CAL) += cal.o | 11 | COREUTILS-$(CONFIG_CAL) += cal.o |
@@ -86,3 +86,7 @@ APPLET_SRC-a+=$(COREUTILS_SRC-a) | |||
86 | 86 | ||
87 | coreutils_OBJ:= $(patsubst %,$(objdir)/%,$(COREUTILS-y)) | 87 | coreutils_OBJ:= $(patsubst %,$(objdir)/%,$(COREUTILS-y)) |
88 | 88 | ||
89 | $(coreutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c | ||
90 | $(objdir)/coreutils.a: $(coreutils_OBJ) | ||
91 | libraries-y:=$(libraries-y) $(objdir)/coreutils.a | ||
92 | |||
diff --git a/coreutils/libcoreutils/Makefile.in b/coreutils/libcoreutils/Makefile.in index 700341c97..d89e9d049 100644 --- a/coreutils/libcoreutils/Makefile.in +++ b/coreutils/libcoreutils/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 | ||
7 | srcdir=$(top_srcdir)/coreutils/libcoreutils | 7 | srcdir:=$(top_srcdir)/coreutils/libcoreutils |
8 | objdir=$(top_builddir)/coreutils/libcoreutils | 8 | objdir:=$(top_builddir)/coreutils/libcoreutils |
9 | 9 | ||
10 | LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod | 10 | LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod |
11 | LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod | 11 | LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod |
@@ -21,3 +21,8 @@ LIBRARY_SRC-y+=$(LIBCOREUTILS_SRC-y) | |||
21 | LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a) | 21 | LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a) |
22 | 22 | ||
23 | coreutils_libcoreutils_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBCOREUTILS-y)) | 23 | coreutils_libcoreutils_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBCOREUTILS-y)) |
24 | |||
25 | $(coreutils_libcoreutils_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c | ||
26 | $(objdir)/libcoreutils.a: $(coreutils_libcoreutils_OBJ$(os)) | ||
27 | libraries-y:=$(libraries-y) $(objdir)/libcoreutils.a | ||
28 | |||