X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=findutils%2FMakefile.in;h=25a2d38d35660076236d64959a98397703a0f350;hb=42f091a76120b4bf2ab7466dfaaf8907f9d9b189;hp=7fbf8d4b947c8cb915c4975740b5603e565ede79;hpb=07a79e75f502ebd41e5341aacc5de303d3ffaea0;p=oweals%2Fbusybox.git

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)