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

diff --git a/editors/Makefile.in b/editors/Makefile.in
index 01fb8b527..9a46e32c2 100644
--- a/editors/Makefile.in
+++ b/editors/Makefile.in
@@ -11,25 +11,30 @@ endif
 srcdir=$(top_srcdir)/editors
 
 EDITOR-y:=
-EDITOR-$(CONFIG_AWK)	   += awk.o
-EDITOR-$(CONFIG_PATCH)	   += patch.o
+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
-EDITOR_SRC:= $(EDITOR-y)
-EDITOR_OBJ:= $(patsubst %.c,$(EDITOR_DIR)%.o, $(EDITOR_SRC))
 
+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)
 
 needlibm-y:=
 needlibm-$(CONFIG_FEATURE_AWK_MATH) := y
 
 ifeq ($(needlibm-y),y)
-  LIBRARIES += -lm
+  LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES))
 endif
 
 $(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
-	$(AR) $(ARFLAGS) $@ $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
+	$(do_ar)
 
 $(EDITOR_DIR)%.o: $(srcdir)/%.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
+	$(compile.c)