From 07a79e75f502ebd41e5341aacc5de303d3ffaea0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 9 Mar 2006 09:03:37 +0000 Subject: - backout using features which are not available with the previous stable version of make (3.71.1). --- coreutils/Makefile.in | 8 ++++++-- coreutils/libcoreutils/Makefile.in | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'coreutils') 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 + -- cgit v1.2.3