Patch from Denis Vlasenko, tweak error messages.

[oweals/busybox.git] / networking / Makefile.in

diff --git a/networking/Makefile.in b/networking/Makefile.in
index efad05053e4886d2a7f9fd78bdc4a748f3c2a218..650fc1a4ad20f6f0c67857a2b997829eb729af85 100644 (file)
--- a/networking/Makefile.in
+++ b/networking/Makefile.in
@@ -4,9 +4,13 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
+NETWORKING_AR:=networking.a
+ifndef $(NETWORKING_DIR)
+NETWORKING_DIR:=$(top_builddir)/networking/
+endif
 srcdir=$(top_srcdir)/networking
-objdir=$(top_builddir)/networking
 
+NETWORKING-y:=
 NETWORKING-$(CONFIG_ARPING)       += arping.o
 NETWORKING-$(CONFIG_DNSD)         += dnsd.o
 NETWORKING-$(CONFIG_ETHER_WAKE)   += ether-wake.o
@@ -40,11 +44,8 @@ NETWORKING-$(CONFIG_WGET)         += wget.o
 NETWORKING-$(CONFIG_ZCIP)         += zcip.o
 
 NETWORKING-y:=$(sort $(NETWORKING-y))
-
-needcrypt-y:=
-needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
-ifeq ($(needcrypt-y),y)
-       LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
+ifneq ($(strip $(NETWORKING-y)),)
+libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR)
 endif
 
 NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y))
@@ -55,5 +56,15 @@ APPLET_SRC-a+=$(NETWORKING_SRC-a)
 LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking
 LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking
 
-networking_OBJ:=  $(patsubst %,$(objdir)/%,$(NETWORKING-y))
+needcrypt-y:=
+needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
+
+ifeq ($(needcrypt-y),y)
+       LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
+endif
+
+$(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
+       $(do_ar)
 
+$(NETWORKING_DIR)%.o: $(srcdir)/%.c
+       $(compile.c)