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-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz | |
- 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 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -srcdir:=$(top_srcdir)/findutils -objdir:=$(top_builddir)/findutils +FINDUTILS_AR:=findutils.a +ifndef $(FINDUTILS_DIR) +FINDUTILS_DIR:=$(top_builddir)/findutils/ +endif +srcdir=$(top_srcdir)/findutils +FINDUTILS-y:= FINDUTILS-$(CONFIG_FIND) += find.o FINDUTILS-$(CONFIG_GREP) += grep.o FINDUTILS-$(CONFIG_XARGS) += xargs.o +ifneq ($(strip $(FINDUTILS-y)),) +libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR) +endif + FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y)) FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(FINDUTILS_SRC-y) APPLET_SRC-a+=$(FINDUTILS_SRC-a) -findutils_OBJ:= $(patsubst %,$(objdir)/%,$(FINDUTILS-y)) - -$(findutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c -$(objdir)/findutils.a: $(findutils_OBJ) -libraries-y:=$(libraries-y) $(objdir)/findutils.a +$(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y)) + $(do_ar) +$(FINDUTILS_DIR)%.o: $(srcdir)/%.c + $(compile.c) |