diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-13 19:04:00 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-13 19:04:00 +0000 |
commit | df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch) | |
tree | 49493696039b285aa751a5bc884fc70c9c85e878 /findutils | |
parent | c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff) | |
download | busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2 busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip |
- revert back to r14406
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/Makefile.in | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/findutils/Makefile.in b/findutils/Makefile.in index 7fbf8d4b9..25a2d38d3 100644 --- a/findutils/Makefile.in +++ b/findutils/Makefile.in | |||
@@ -4,21 +4,28 @@ | |||
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 | srcdir:=$(top_srcdir)/findutils | 7 | FINDUTILS_AR:=findutils.a |
8 | objdir:=$(top_builddir)/findutils | 8 | ifndef $(FINDUTILS_DIR) |
9 | FINDUTILS_DIR:=$(top_builddir)/findutils/ | ||
10 | endif | ||
11 | srcdir=$(top_srcdir)/findutils | ||
9 | 12 | ||
13 | FINDUTILS-y:= | ||
10 | FINDUTILS-$(CONFIG_FIND) += find.o | 14 | FINDUTILS-$(CONFIG_FIND) += find.o |
11 | FINDUTILS-$(CONFIG_GREP) += grep.o | 15 | FINDUTILS-$(CONFIG_GREP) += grep.o |
12 | FINDUTILS-$(CONFIG_XARGS) += xargs.o | 16 | FINDUTILS-$(CONFIG_XARGS) += xargs.o |
13 | 17 | ||
18 | ifneq ($(strip $(FINDUTILS-y)),) | ||
19 | libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR) | ||
20 | endif | ||
21 | |||
14 | FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y)) | 22 | FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y)) |
15 | FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) | 23 | FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) |
16 | APPLET_SRC-y+=$(FINDUTILS_SRC-y) | 24 | APPLET_SRC-y+=$(FINDUTILS_SRC-y) |
17 | APPLET_SRC-a+=$(FINDUTILS_SRC-a) | 25 | APPLET_SRC-a+=$(FINDUTILS_SRC-a) |
18 | 26 | ||
19 | findutils_OBJ:= $(patsubst %,$(objdir)/%,$(FINDUTILS-y)) | 27 | $(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y)) |
20 | 28 | $(do_ar) | |
21 | $(findutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c | ||
22 | $(objdir)/findutils.a: $(findutils_OBJ) | ||
23 | libraries-y:=$(libraries-y) $(objdir)/findutils.a | ||
24 | 29 | ||
30 | $(FINDUTILS_DIR)%.o: $(srcdir)/%.c | ||
31 | $(compile.c) | ||