1 files changed, 12 insertions, 23 deletions

diff --git a/editors/Makefile.in b/editors/Makefile.in
index 805017dcc..19d8bf8e6 100644
--- a/editors/Makefile.in
+++ b/editors/Makefile.in
@@ -4,36 +4,25 @@
 #
 # 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
 
-EDITOR-y:=
-EDITOR-$(CONFIG_AWK)       += awk.o
-EDITOR-$(CONFIG_PATCH)     += patch.o
-EDITOR-$(CONFIG_SED)       += sed.o
-EDITOR-$(CONFIG_VI)        += vi.o
-
-ifneq ($(strip $(EDITOR-y)),)
-libraries-y+=$(EDITOR_DIR)$(EDITOR_AR)
-endif
-
-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-$(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
 
 ifeq ($(needlibm-y),y)
-  LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES))
+  LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm
 endif
 
-$(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
-        $(do_ar)
+EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITORS-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))
 
-$(EDITOR_DIR)%.o: $(srcdir)/%.c
-        $(compile.c)