Patch from Denis Vlasenko turning static const int (which gets emitted into

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

diff --git a/networking/Makefile.in b/networking/Makefile.in
index ecfd8235bc73f2021d492a3d709d16af3bac6ecf..80cfd17333a4d8232a3d419364155cea53ec1849 100644 (file)
--- a/networking/Makefile.in
+++ b/networking/Makefile.in
@@ -4,20 +4,18 @@
 #
 # 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
-NETWORKING-y:=
+srcdir:=$(top_srcdir)/networking
+objdir:=$(top_builddir)/networking
+
 NETWORKING-$(CONFIG_ARPING)       += arping.o
+NETWORKING-$(CONFIG_DNSD)         += dnsd.o
 NETWORKING-$(CONFIG_ETHER_WAKE)   += ether-wake.o
 NETWORKING-$(CONFIG_FAKEIDENTD)   += fakeidentd.o
 NETWORKING-$(CONFIG_FTPGET)       += ftpgetput.o
 NETWORKING-$(CONFIG_FTPPUT)       += ftpgetput.o
 NETWORKING-$(CONFIG_HOSTNAME)     += hostname.o
 NETWORKING-$(CONFIG_HTTPD)        += httpd.o
-NETWORKING-$(CONFIG_IFCONFIG)     += ifconfig.o
+NETWORKING-$(CONFIG_IFCONFIG)     += ifconfig.o interface.o
 NETWORKING-$(CONFIG_IFUPDOWN)     += ifupdown.o
 NETWORKING-$(CONFIG_INETD)        += inetd.o
 NETWORKING-$(CONFIG_IP)           += ip.o
@@ -41,17 +39,25 @@ NETWORKING-$(CONFIG_VCONFIG)      += vconfig.o
 NETWORKING-$(CONFIG_WGET)         += wget.o
 NETWORKING-$(CONFIG_ZCIP)         += zcip.o
 
-libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR)
+NETWORKING-y:=$(sort $(NETWORKING-y))
 
 needcrypt-y:=
 needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
-
 ifeq ($(needcrypt-y),y)
-       LIBRARIES += -lcrypt
+       LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
 endif
 
-$(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
-       $(AR) $(ARFLAGS) $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
+NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y))
+NETWORKING_SRC-a:=$(wildcard $(srcdir)/*.c)
+APPLET_SRC-y+=$(NETWORKING_SRC-y)
+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))
+
+$(networking_OBJ): $(objdir)/%.o: $(srcdir)/%.c
+$(objdir)/networking.a: $(networking_OBJ)
+libraries-y:=$(libraries-y) $(objdir)/networking.a
 
-$(NETWORKING_DIR)%.o: $(srcdir)/%.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<