aboutsummaryrefslogtreecommitdiff
path: root/coreutils/libcoreutils
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /coreutils/libcoreutils
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
- revert back to r14406
Diffstat (limited to 'coreutils/libcoreutils')
-rw-r--r--coreutils/libcoreutils/Makefile.in35
1 files changed, 23 insertions, 12 deletions
diff --git a/coreutils/libcoreutils/Makefile.in b/coreutils/libcoreutils/Makefile.in
index d89e9d049..30a38c9d9 100644
--- a/coreutils/libcoreutils/Makefile.in
+++ b/coreutils/libcoreutils/Makefile.in
@@ -4,25 +4,36 @@
#
# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/coreutils/libcoreutils
-objdir:=$(top_builddir)/coreutils/libcoreutils
+LIBCOREUTILS_AR:=libcoreutils.a
+ifndef $(LIBCOREUTILS_DIR)
+LIBCOREUTILS_DIR:=$(top_builddir)/coreutils/libcoreutils
+endif
+srcdir=$(top_srcdir)/coreutils/libcoreutils
-LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod
-LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod
-LIBCOREUTILS-$(CONFIG_INSTALL) += cp_mv_stat
-LIBCOREUTILS-$(CONFIG_CP) += cp_mv_stat
-LIBCOREUTILS-$(CONFIG_MV) += cp_mv_stat
+LIBCOREUTILS_ALL_SRC:= cp_mv_stat.c getopt_mk_fifo_nod.c
+
+LIBCOREUTILS-y:=
+LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod.o
+LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod.o
+LIBCOREUTILS-$(CONFIG_INSTALL) += cp_mv_stat.o
+LIBCOREUTILS-$(CONFIG_CP) += cp_mv_stat.o
+LIBCOREUTILS-$(CONFIG_MV) += cp_mv_stat.o
LIBCOREUTILS-y:=$(sort $(LIBCOREUTILS-y))
-LIBCOREUTILS_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBCOREUTILS-y))
+LIBCOREUTILS_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBCOREUTILS-y)))
LIBCOREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
LIBRARY_SRC-y+=$(LIBCOREUTILS_SRC-y)
LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a)
-coreutils_libcoreutils_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBCOREUTILS-y))
+ifneq ($(strip $(LIBCOREUTILS-y)),)
+libraries-y+=$(LIBCOREUTILS_DIR)/$(LIBCOREUTILS_AR)
+endif
+
+LIBCOREUTILS_OBJS=$(patsubst %,$(LIBCOREUTILS_DIR)/%, $(LIBCOREUTILS-y))
-$(coreutils_libcoreutils_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c
-$(objdir)/libcoreutils.a: $(coreutils_libcoreutils_OBJ$(os))
-libraries-y:=$(libraries-y) $(objdir)/libcoreutils.a
+$(LIBCOREUTILS_DIR)/$(LIBCOREUTILS_AR): $(patsubst %,$(LIBCOREUTILS_DIR)/%,$(LIBCOREUTILS-y))
+ $(do_ar)
+$(LIBCOREUTILS_DIR)/%.o: $(srcdir)/%.c
+ $(compile.c)