diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-09 12:03:37 +0300 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-09 12:03:37 +0300 |
commit | 07a79e75f502ebd41e5341aacc5de303d3ffaea0 (patch) | |
tree | 4b95f98bab0b298c5df171772b629d03400ef507 /coreutils | |
parent | 874af85d5eb08b65476f406f6a1e7edc127ac210 (diff) |
- backout using features which are not available with the previous stable
version of make (3.71.1).
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 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -srcdir=$(top_srcdir)/coreutils -objdir=$(top_builddir)/coreutils +srcdir:=$(top_srcdir)/coreutils +objdir:=$(top_builddir)/coreutils COREUTILS-$(CONFIG_BASENAME) += basename.o COREUTILS-$(CONFIG_CAL) += cal.o @@ -86,3 +86,7 @@ APPLET_SRC-a+=$(COREUTILS_SRC-a) coreutils_OBJ:= $(patsubst %,$(objdir)/%,$(COREUTILS-y)) +$(coreutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/coreutils.a: $(coreutils_OBJ) +libraries-y:=$(libraries-y) $(objdir)/coreutils.a + 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 @@ # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -srcdir=$(top_srcdir)/coreutils/libcoreutils -objdir=$(top_builddir)/coreutils/libcoreutils +srcdir:=$(top_srcdir)/coreutils/libcoreutils +objdir:=$(top_builddir)/coreutils/libcoreutils LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod @@ -21,3 +21,8 @@ LIBRARY_SRC-y+=$(LIBCOREUTILS_SRC-y) LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a) coreutils_libcoreutils_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBCOREUTILS-y)) + +$(coreutils_libcoreutils_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c +$(objdir)/libcoreutils.a: $(coreutils_libcoreutils_OBJ$(os)) +libraries-y:=$(libraries-y) $(objdir)/libcoreutils.a + |