diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/Makefile.in | 16 | ||||
-rw-r--r-- | coreutils/libcoreutils/Makefile.in | 44 |
2 files changed, 11 insertions, 49 deletions
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in index 2ab256c15..eee64a995 100644 --- a/coreutils/Makefile.in +++ b/coreutils/Makefile.in | |||
@@ -4,13 +4,9 @@ | |||
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 | COREUTILS_AR:=coreutils.a | ||
8 | ifndef $(COREUTILS_DIR) | ||
9 | COREUTILS_DIR:=$(top_builddir)/coreutils/ | ||
10 | endif | ||
11 | srcdir=$(top_srcdir)/coreutils | 7 | srcdir=$(top_srcdir)/coreutils |
8 | objdir=$(top_builddir)/coreutils | ||
12 | 9 | ||
13 | COREUTILS-y:= | ||
14 | COREUTILS-$(CONFIG_BASENAME) += basename.o | 10 | COREUTILS-$(CONFIG_BASENAME) += basename.o |
15 | COREUTILS-$(CONFIG_CAL) += cal.o | 11 | COREUTILS-$(CONFIG_CAL) += cal.o |
16 | COREUTILS-$(CONFIG_CAT) += cat.o | 12 | COREUTILS-$(CONFIG_CAT) += cat.o |
@@ -82,18 +78,12 @@ COREUTILS-$(CONFIG_WHOAMI) += whoami.o | |||
82 | COREUTILS-$(CONFIG_YES) += yes.o | 78 | COREUTILS-$(CONFIG_YES) += yes.o |
83 | 79 | ||
84 | COREUTILS-y:=$(sort $(COREUTILS-y)) | 80 | COREUTILS-y:=$(sort $(COREUTILS-y)) |
85 | 81 | COREUTILS-m:=$(sort $(COREUTILS-m)) | |
86 | ifneq ($(strip $(COREUTILS-y)),) | ||
87 | libraries-y+=$(COREUTILS_DIR)$(COREUTILS_AR) | ||
88 | endif | ||
89 | 82 | ||
90 | COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y)) | 83 | COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y)) |
91 | COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) | 84 | COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) |
92 | APPLET_SRC-y+=$(COREUTILS_SRC-y) | 85 | APPLET_SRC-y+=$(COREUTILS_SRC-y) |
93 | APPLET_SRC-a+=$(COREUTILS_SRC-a) | 86 | APPLET_SRC-a+=$(COREUTILS_SRC-a) |
94 | 87 | ||
95 | $(COREUTILS_DIR)$(COREUTILS_AR): $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y)) | 88 | coreutils_OBJ:= $(patsubst %,$(objdir)/%,$(COREUTILS-y)) |
96 | $(do_ar) | ||
97 | 89 | ||
98 | $(COREUTILS_DIR)%.o: $(srcdir)/%.c | ||
99 | $(compile.c) | ||
diff --git a/coreutils/libcoreutils/Makefile.in b/coreutils/libcoreutils/Makefile.in index 092019124..700341c97 100644 --- a/coreutils/libcoreutils/Makefile.in +++ b/coreutils/libcoreutils/Makefile.in | |||
@@ -3,49 +3,21 @@ | |||
3 | # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | 3 | # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> |
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 | # | ||
7 | 6 | ||
8 | LIBCOREUTILS_AR:=libcoreutils.a | ||
9 | ifndef $(LIBCOREUTILS_DIR) | ||
10 | LIBCOREUTILS_DIR:=$(top_builddir)/coreutils/libcoreutils | ||
11 | endif | ||
12 | srcdir=$(top_srcdir)/coreutils/libcoreutils | 7 | srcdir=$(top_srcdir)/coreutils/libcoreutils |
8 | objdir=$(top_builddir)/coreutils/libcoreutils | ||
13 | 9 | ||
14 | LIBCOREUTILS_ALL_SRC:= cp_mv_stat.c getopt_mk_fifo_nod.c | 10 | LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod |
15 | 11 | LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod | |
16 | LIBCOREUTILS-y:= | 12 | LIBCOREUTILS-$(CONFIG_INSTALL) += cp_mv_stat |
17 | LIBCOREUTILS-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod.o | 13 | LIBCOREUTILS-$(CONFIG_CP) += cp_mv_stat |
18 | LIBCOREUTILS-$(CONFIG_MKNOD) += getopt_mk_fifo_nod.o | 14 | LIBCOREUTILS-$(CONFIG_MV) += cp_mv_stat |
19 | LIBCOREUTILS-$(CONFIG_INSTALL) += cp_mv_stat.o | ||
20 | LIBCOREUTILS-$(CONFIG_CP) += cp_mv_stat.o | ||
21 | LIBCOREUTILS-$(CONFIG_MV) += cp_mv_stat.o | ||
22 | 15 | ||
23 | LIBCOREUTILS-y:=$(sort $(LIBCOREUTILS-y)) | 16 | LIBCOREUTILS-y:=$(sort $(LIBCOREUTILS-y)) |
24 | 17 | ||
25 | LIBCOREUTILS_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBCOREUTILS-y))) | 18 | LIBCOREUTILS_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBCOREUTILS-y)) |
26 | LIBCOREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) | 19 | LIBCOREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) |
27 | LIBRARY_SRC-y+=$(LIBCOREUTILS_SRC-y) | 20 | LIBRARY_SRC-y+=$(LIBCOREUTILS_SRC-y) |
28 | LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a) | 21 | LIBRARY_SRC-a+=$(LIBCOREUTILS_SRC-a) |
29 | 22 | ||
30 | LIBCOREUTILS-multi-obj:=$(LIBCOREUTILS_DIR)/$(subst .a,-multi.o,$(LIBCOREUTILS_AR)) | 23 | coreutils_libcoreutils_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBCOREUTILS-y)) |
31 | LIBCOREUTILS-multi-pic:=$(LIBCOREUTILS_DIR)/$(subst .a,-pic.o,$(LIBCOREUTILS_AR)) | ||
32 | |||
33 | # We do not need to build an empty non-pic object/archive | ||
34 | ifneq ($(strip $(LIBCOREUTILS-y)),) | ||
35 | libraries-y+=$(LIBCOREUTILS_DIR)/$(LIBCOREUTILS_AR) | ||
36 | endif | ||
37 | # If we are building libbusybox.so _and_ we will use it ourselves then we | ||
38 | # keep it as small as possible | ||
39 | ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) | ||
40 | ifneq ($(strip $(LIBIPROUTE-y)),) | ||
41 | libraries-m+=$(LIBCOREUTILS-multi-pic) | ||
42 | endif | ||
43 | endif | ||
44 | |||
45 | LIBCOREUTILS_OBJS=$(patsubst %,$(LIBCOREUTILS_DIR)/%, $(LIBCOREUTILS-y)) | ||
46 | |||
47 | $(LIBCOREUTILS_DIR)/$(LIBCOREUTILS_AR): $(patsubst %,$(LIBCOREUTILS_DIR)/%,$(LIBCOREUTILS-y)) | ||
48 | $(do_ar) | ||
49 | |||
50 | $(LIBCOREUTILS_DIR)/%.o: $(srcdir)/%.c | ||
51 | $(compile.c) | ||