summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /networking
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip
- revert back to r14406
Diffstat (limited to 'networking')
-rw-r--r--networking/Makefile.in29
-rw-r--r--networking/libiproute/Makefile.in106
-rw-r--r--networking/udhcp/Makefile.in99
3 files changed, 105 insertions, 129 deletions
diff --git a/networking/Makefile.in b/networking/Makefile.in
index 80cfd1733..650fc1a4a 100644
--- a/networking/Makefile.in
+++ b/networking/Makefile.in
@@ -4,9 +4,13 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7srcdir:=$(top_srcdir)/networking 7NETWORKING_AR:=networking.a
8objdir:=$(top_builddir)/networking 8ifndef $(NETWORKING_DIR)
9NETWORKING_DIR:=$(top_builddir)/networking/
10endif
11srcdir=$(top_srcdir)/networking
9 12
13NETWORKING-y:=
10NETWORKING-$(CONFIG_ARPING) += arping.o 14NETWORKING-$(CONFIG_ARPING) += arping.o
11NETWORKING-$(CONFIG_DNSD) += dnsd.o 15NETWORKING-$(CONFIG_DNSD) += dnsd.o
12NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o 16NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o
@@ -40,11 +44,8 @@ NETWORKING-$(CONFIG_WGET) += wget.o
40NETWORKING-$(CONFIG_ZCIP) += zcip.o 44NETWORKING-$(CONFIG_ZCIP) += zcip.o
41 45
42NETWORKING-y:=$(sort $(NETWORKING-y)) 46NETWORKING-y:=$(sort $(NETWORKING-y))
43 47ifneq ($(strip $(NETWORKING-y)),)
44needcrypt-y:= 48libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR)
45needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
46ifeq ($(needcrypt-y),y)
47 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
48endif 49endif
49 50
50NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y)) 51NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y))
@@ -55,9 +56,15 @@ APPLET_SRC-a+=$(NETWORKING_SRC-a)
55LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking 56LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking
56LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking 57LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking
57 58
58networking_OBJ:= $(patsubst %,$(objdir)/%,$(NETWORKING-y)) 59needcrypt-y:=
60needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
61
62ifeq ($(needcrypt-y),y)
63 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
64endif
59 65
60$(networking_OBJ): $(objdir)/%.o: $(srcdir)/%.c 66$(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
61$(objdir)/networking.a: $(networking_OBJ) 67 $(do_ar)
62libraries-y:=$(libraries-y) $(objdir)/networking.a
63 68
69$(NETWORKING_DIR)%.o: $(srcdir)/%.c
70 $(compile.c)
diff --git a/networking/libiproute/Makefile.in b/networking/libiproute/Makefile.in
index 3ad77ecfc..f713502b3 100644
--- a/networking/libiproute/Makefile.in
+++ b/networking/libiproute/Makefile.in
@@ -3,71 +3,81 @@
3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 5# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
6#
6 7
7srcdir:=$(top_srcdir)/networking/libiproute 8LIBIPROUTE_AR:=libiproute.a
8objdir:=$(top_builddir)/networking/libiproute 9ifndef $(LIBIPROUTE_DIR)
10LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute
11endif
12srcdir=$(top_srcdir)/networking/libiproute
9 13
14LIBIPROUTE-y:=
10LIBIPROUTE-$(CONFIG_IP) += \ 15LIBIPROUTE-$(CONFIG_IP) += \
11 ip_parse_common_args \ 16 ip_parse_common_args.o \
12 ipaddress \ 17 ipaddress.o \
13 iplink \ 18 iplink.o \
14 iproute \ 19 iproute.o \
15 iptunnel \ 20 iptunnel.o \
16 libnetlink \ 21 libnetlink.o \
17 ll_addr \ 22 ll_addr.o \
18 ll_map \ 23 ll_map.o \
19 ll_proto \ 24 ll_proto.o \
20 ll_types \ 25 ll_types.o \
21 rt_names \ 26 rt_names.o \
22 rtm_map \ 27 rtm_map.o \
23 utils 28 utils.o
24 29
25LIBIPROUTE-$(CONFIG_IPADDR) += \ 30LIBIPROUTE-$(CONFIG_IPADDR) += \
26 ip_parse_common_args \ 31 ip_parse_common_args.o \
27 ipaddress \ 32 ipaddress.o \
28 libnetlink \ 33 libnetlink.o \
29 ll_addr \ 34 ll_addr.o \
30 ll_map \ 35 ll_map.o \
31 ll_types \ 36 ll_types.o \
32 rt_names \ 37 rt_names.o \
33 utils 38 utils.o
34 39
35LIBIPROUTE-$(CONFIG_IPLINK) += \ 40LIBIPROUTE-$(CONFIG_IPLINK) += \
36 ip_parse_common_args \ 41 ip_parse_common_args.o \
37 ipaddress \ 42 ipaddress.o \
38 iplink \ 43 iplink.o \
39 libnetlink \ 44 libnetlink.o \
40 ll_addr \ 45 ll_addr.o \
41 ll_map \ 46 ll_map.o \
42 ll_types \ 47 ll_types.o \
43 rt_names \ 48 rt_names.o \
44 utils 49 utils.o
45 50
46LIBIPROUTE-$(CONFIG_IPROUTE) += \ 51LIBIPROUTE-$(CONFIG_IPROUTE) += \
47 ip_parse_common_args \ 52 ip_parse_common_args.o \
48 iproute \ 53 iproute.o \
49 libnetlink \ 54 libnetlink.o \
50 ll_map \ 55 ll_map.o \
51 rt_names \ 56 rt_names.o \
52 rtm_map \ 57 rtm_map.o \
53 utils 58 utils.o
54 59
55LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ 60LIBIPROUTE-$(CONFIG_IPTUNNEL) += \
56 ip_parse_common_args \ 61 ip_parse_common_args.o \
57 iptunnel \ 62 iptunnel.o \
58 rt_names \ 63 rt_names.o \
59 utils 64 utils.o
60 65
61LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y)) 66LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y))
62 67
63LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBIPROUTE-y)) 68LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y)))
64LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c) 69LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c)
65LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y) 70LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y)
66LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) 71LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a)
67 72
68networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) 73LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
74
75ifneq ($(strip $(LIBIPROUTE-y)),)
76libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
77endif
69 78
70$(networking_libiproute_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c 79$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)/%,$(LIBIPROUTE-y))
71$(objdir)/libiproute.a: $(networking_libiproute_OBJ$(os)) 80 $(do_ar)
72libraries-y:=$(libraries-y) $(objdir)/libiproute.a
73 81
82$(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c
83 $(compile.c)
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in
index 210939fd6..df32247c6 100644
--- a/networking/udhcp/Makefile.in
+++ b/networking/udhcp/Makefile.in
@@ -3,9 +3,13 @@
3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 5# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
6#
6 7
7srcdir:=$(top_srcdir)/networking/udhcp 8UDHCP_AR:=udhcp.a
8objdir:=$(top_builddir)/networking/udhcp 9ifndef $(UDHCP_DIR)
10UDHCP_DIR:=$(top_builddir)/networking/udhcp/
11endif
12srcdir=$(top_srcdir)/networking/udhcp
9 13
10#ok, so I forgot how to do an or, but this is a quick and dirty hack 14#ok, so I forgot how to do an or, but this is a quick and dirty hack
11ifeq ($(strip $(CONFIG_UDHCPC)),y) 15ifeq ($(strip $(CONFIG_UDHCPC)),y)
@@ -18,77 +22,32 @@ CONFIG_UDHCP_SHARED=n
18endif 22endif
19endif 23endif
20 24
21UDHCP__SHARED_FILES:=common.c options.c packet.c pidfile.c signalpipe.c socket.c 25UDHCP-y:=
22UDHCP__UDHCPC_FILES:=dhcpc.c clientpacket.c clientsocket.c script.c 26UDHCP-$(CONFIG_UDHCP_SHARED) += common.c options.c packet.c pidfile.c \
23UDHCP__UDHCPD_FILES:=dhcpd.c arpping.c files.c leases.c serverpacket.c \ 27 signalpipe.c socket.c
24 static_leases.c 28UDHCP-$(CONFIG_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \
25UDHCP__DUMPLEASES_FILES:=dumpleases.c 29 script.c
26 30UDHCP-$(CONFIG_UDHCPD) += dhcpd.c arpping.c files.c leases.c \
27UDHCP-$(CONFIG_UDHCP_SHARED) += $(UDHCP__SHARED_FILES) 31 serverpacket.c static_leases.c
28UDHCP-$(CONFIG_UDHCPC) += $(UDHCP__UDHCPC_FILES) 32UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.c
29UDHCP-$(CONFIG_UDHCPD) += $(UDHCP__UDHCPD_FILES) 33UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
30UDHCP-$(CONFIG_DUMPLEASES) += $(UDHCP__DUMPLEASES_FILES) 34
35ifneq ($(strip $(UDHCP-y)),)
36libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
37endif
31 38
32UDHCP_SRC-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y)) 39UDHCP-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y))
33UDHCP_SRC-a:=$(wildcard $(srcdir)/*.c) 40UDHCP-a:=$(wildcard $(srcdir)/*.c)
34APPLET_SRC-y+=$(UDHCP_SRC-y) 41APPLET_SRC-y+=$(UDHCP-y)
35APPLET_SRC-a+=$(UDHCP_SRC-a) 42APPLET_SRC-a+=$(UDHCP-a)
36 43
37UDHCP_INCLUDES:=$(srcdir) 44UDHCP_INCLUDES:=$(srcdir)
38 45
39#APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES) -DIN_BUSYBOX 46APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
40#APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES) -DIN_BUSYBOX 47APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
41
42CFLAGS-udhcp:= -I$(UDHCP_INCLUDES)
43
44# bug in make-3.80 prevents this:
45#define udhcp__flags
46#CFLAGS-udhcp-$(1):=-DIN_BUSYBOX
47#endef
48#
49#ifeq ($(CONFIG_UDHCP_SHARED),y)
50#$(foreach f,$(UDHCP__SHARED_FILES),$(eval $(call udhcp__flags,$(f))))
51#endif
52#ifeq ($(CONFIG_UDHCPC),y)
53#$(foreach f,$(UDHCP__UDHCPC_FILES),$(eval $(call udhcp__flags,$(f))))
54#endif
55#ifeq ($(CONFIG_UDHCPD),y)
56#$(foreach f,$(UDHCP__UDHCPD_FILES),$(eval $(call udhcp__flags,$(f))))
57#endif
58#ifeq ($(CONFIG_DUMPLEASES),y)
59#$(foreach f,$(UDHCP__DUMPLEASES_FILES),$(eval $(call udhcp__flags,$(f))))
60#endif
61
62ifeq ($(CONFIG_UDHCP_SHARED),y)
63CFLAGS-udhcp-common.c:=-DIN_BUSYBOX
64CFLAGS-udhcp-options.c:=-DIN_BUSYBOX
65CFLAGS-udhcp-packet.c:=-DIN_BUSYBOX
66CFLAGS-udhcp-pidfile.c:=-DIN_BUSYBOX
67CFLAGS-udhcp-signalpipe.c:=-DIN_BUSYBOX
68CFLAGS-udhcp-socket.c:=-DIN_BUSYBOX
69endif
70ifeq ($(CONFIG_UDHCPC),y)
71CFLAGS-udhcp-dhcpc.c:=-DIN_BUSYBOX
72CFLAGS-udhcp-clientpacket.c:=-DIN_BUSYBOX
73CFLAGS-udhcp-clientsocket.c:=-DIN_BUSYBOX
74CFLAGS-udhcp-script.c:=-DIN_BUSYBOX
75endif
76ifeq ($(CONFIG_UDHCPD),y)
77CFLAGS-udhcp-dhcpd.c:=-DIN_BUSYBOX
78CFLAGS-udhcp-arpping.c:=-DIN_BUSYBOX
79CFLAGS-udhcp-files.c:=-DIN_BUSYBOX
80CFLAGS-udhcp-leases.c:=-DIN_BUSYBOX
81CFLAGS-udhcp-serverpacket.c:=-DIN_BUSYBOX
82CFLAGS-udhcp-static_leases.c:=-DIN_BUSYBOX
83endif
84ifeq ($(CONFIG_DUMPLEASES),y)
85CFLAGS-udhcp-dumpleases.c:=-DIN_BUSYBOX
86endif
87
88
89networking_udhcp_OBJ:=$(patsubst %.c,$(objdir)/%.o,$(UDHCP-y))
90 48
91$(networking_udhcp_OBJ): $(objdir)/%.o: $(srcdir)/%.c 49$(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
92$(objdir)/udhcp.a: $(networking_udhcp_OBJ) 50 $(do_ar)
93libraries-y:=$(libraries-y) $(objdir)/udhcp.a
94 51
52$(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c
53 $(compile.c) -DIN_BUSYBOX
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-12 13:16:53 +0000