diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/Makefile.in | 21 | ||||
| -rw-r--r-- | coreutils/libcoreutils/Makefile.in | 35 |
2 files changed, 37 insertions, 19 deletions
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in index 73581f2..2ab256c 100644 --- a/coreutils/Makefile.in +++ b/coreutils/Makefile.in @@ -4,9 +4,13 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -srcdir:=$(top_srcdir)/coreutils -objdir:=$(top_builddir)/coreutils +COREUTILS_AR:=coreutils.a +ifndef $(COREUTILS_DIR) +COREUTILS_DIR:=$(top_builddir)/coreutils/ +endif +srcdir=$(top_srcdir)/coreutils +COREUTILS-y:= COREUTILS-$(CONFIG_BASENAME) += basename.o COREUTILS-$(CONFIG_CAL) += cal.o COREUTILS-$(CONFIG_CAT) += cat.o @@ -79,14 +83,17 @@ COREUTILS-$(CONFIG_YES) += yes.o COREUTILS-y:=$(sort $(COREUTILS-y)) +ifneq ($(strip $(COREUTILS-y)),) +libraries-y+=$(COREUTILS_DIR)$(COREUTILS_AR) +endif + COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y)) COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(COREUTILS_SRC-y) 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 +$(COREUTILS_DIR)$(COREUTILS_AR): $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y)) + $(do_ar) +$(COREUTILS_DIR)%.o: $(srcdir)/%.c + $(compile.c) diff --git a/coreutils/libcoreutils/Makefile.in b/coreutils/libcoreutils/Makefile.in index d89e9d0..30a38c9 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) |