X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=editors%2FMakefile.in;h=9a46e32c2a04781229a2d4d1f9995f6f79f4237b;hb=5d8843e451c01d8abfe6b5be772637310e9e581e;hp=19d8bf8e63d45dd9d643a1e5287dbd38f004d175;hpb=5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf;p=oweals%2Fbusybox.git

diff --git a/editors/Makefile.in b/editors/Makefile.in
index 19d8bf8e6..9a46e32c2 100644
--- a/editors/Makefile.in
+++ b/editors/Makefile.in
@@ -4,25 +4,37 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
+EDITOR_AR:=editors.a
+ifndef $(EDITOR_DIR)
+EDITOR_DIR:=$(top_builddir)/editors/
+endif
 srcdir=$(top_srcdir)/editors
-objdir=$(top_builddir)/editors
-
-EDITORS-$(CONFIG_AWK)	+= awk.o
-EDITORS-$(CONFIG_PATCH)	+= patch.o
-EDITORS-$(CONFIG_SED)	+= sed.o
-EDITORS-$(CONFIG_VI)	+= vi.o
 
-needlibm-y:=
-needlibm-$(CONFIG_FEATURE_AWK_MATH) := y
+EDITOR-y:=
+EDITOR-$(CONFIG_AWK)       += awk.o
+EDITOR-$(CONFIG_ED)        += ed.o
+EDITOR-$(CONFIG_PATCH)     += patch.o
+EDITOR-$(CONFIG_SED)       += sed.o
+EDITOR-$(CONFIG_VI)        += vi.o
 
-ifeq ($(needlibm-y),y)
-  LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm
+ifneq ($(strip $(EDITOR-y)),)
+libraries-y+=$(EDITOR_DIR)$(EDITOR_AR)
 endif
 
-EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITORS-y))
+EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITOR-y))
 EDITOR_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(EDITOR_SRC-y)
 APPLET_SRC-a+=$(EDITOR_SRC-a)
 
-editors_OBJ:=  $(patsubst %,$(objdir)/%,$(EDITORS-y))
+needlibm-y:=
+needlibm-$(CONFIG_FEATURE_AWK_MATH) := y
+
+ifeq ($(needlibm-y),y)
+  LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES))
+endif
+
+$(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
+	$(do_ar)
 
+$(EDITOR_DIR)%.o: $(srcdir)/%.c
+	$(compile.c)