diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
commit | 5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf (patch) | |
tree | 233c051da862595b6e473e832051708e2d9803cb /networking | |
parent | 12c2429a4242a157217c5bc9673a531fa1e1de61 (diff) | |
download | busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.gz busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.bz2 busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.zip |
- fixes parallel builds (make -j)
- use less resources for the buildsystem itself
Diffstat (limited to 'networking')
-rw-r--r-- | networking/Makefile.in | 29 | ||||
-rw-r--r-- | networking/libiproute/Makefile.in | 110 | ||||
-rw-r--r-- | networking/udhcp/Makefile.in | 93 |
3 files changed, 120 insertions, 112 deletions
diff --git a/networking/Makefile.in b/networking/Makefile.in index 650fc1a4a..0f607eb80 100644 --- a/networking/Makefile.in +++ b/networking/Makefile.in | |||
@@ -4,13 +4,9 @@ | |||
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 | ||
7 | NETWORKING_AR:=networking.a | ||
8 | ifndef $(NETWORKING_DIR) | ||
9 | NETWORKING_DIR:=$(top_builddir)/networking/ | ||
10 | endif | ||
11 | srcdir=$(top_srcdir)/networking | 7 | srcdir=$(top_srcdir)/networking |
8 | objdir=$(top_builddir)/networking | ||
12 | 9 | ||
13 | NETWORKING-y:= | ||
14 | NETWORKING-$(CONFIG_ARPING) += arping.o | 10 | NETWORKING-$(CONFIG_ARPING) += arping.o |
15 | NETWORKING-$(CONFIG_DNSD) += dnsd.o | 11 | NETWORKING-$(CONFIG_DNSD) += dnsd.o |
16 | NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o | 12 | NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o |
@@ -44,8 +40,15 @@ NETWORKING-$(CONFIG_WGET) += wget.o | |||
44 | NETWORKING-$(CONFIG_ZCIP) += zcip.o | 40 | NETWORKING-$(CONFIG_ZCIP) += zcip.o |
45 | 41 | ||
46 | NETWORKING-y:=$(sort $(NETWORKING-y)) | 42 | NETWORKING-y:=$(sort $(NETWORKING-y)) |
47 | ifneq ($(strip $(NETWORKING-y)),) | 43 | NETWORKING-m:=$(sort $(NETWORKING-m)) |
48 | libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR) | 44 | |
45 | needcrypt-y:= | ||
46 | needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y | ||
47 | ifeq ($(needcrypt-m),y) | ||
48 | needcrypt-y:=y | ||
49 | endif | ||
50 | ifeq ($(needcrypt-y),y) | ||
51 | LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) | ||
49 | endif | 52 | endif |
50 | 53 | ||
51 | NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y)) | 54 | NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y)) |
@@ -56,15 +59,5 @@ APPLET_SRC-a+=$(NETWORKING_SRC-a) | |||
56 | LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking | 59 | LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking |
57 | LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking | 60 | LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking |
58 | 61 | ||
59 | needcrypt-y:= | 62 | networking_OBJ:= $(patsubst %,$(objdir)/%,$(NETWORKING-y)) |
60 | needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y | ||
61 | |||
62 | ifeq ($(needcrypt-y),y) | ||
63 | LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) | ||
64 | endif | ||
65 | |||
66 | $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) | ||
67 | $(do_ar) | ||
68 | 63 | ||
69 | $(NETWORKING_DIR)%.o: $(srcdir)/%.c | ||
70 | $(compile.c) | ||
diff --git a/networking/libiproute/Makefile.in b/networking/libiproute/Makefile.in index 6b7bd900c..99fa22e9d 100644 --- a/networking/libiproute/Makefile.in +++ b/networking/libiproute/Makefile.in | |||
@@ -5,88 +5,66 @@ | |||
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 | 7 | ||
8 | LIBIPROUTE_AR:=libiproute.a | ||
9 | ifndef $(LIBIPROUTE_DIR) | ||
10 | LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute | ||
11 | endif | ||
12 | srcdir=$(top_srcdir)/networking/libiproute | 8 | srcdir=$(top_srcdir)/networking/libiproute |
9 | objdir=$(top_builddir)/networking/libiproute | ||
13 | 10 | ||
14 | LIBIPROUTE-y:= | ||
15 | LIBIPROUTE-$(CONFIG_IP) += \ | 11 | LIBIPROUTE-$(CONFIG_IP) += \ |
16 | ip_parse_common_args.o \ | 12 | ip_parse_common_args \ |
17 | ipaddress.o \ | 13 | ipaddress \ |
18 | iplink.o \ | 14 | iplink \ |
19 | iproute.o \ | 15 | iproute \ |
20 | iptunnel.o \ | 16 | iptunnel \ |
21 | libnetlink.o \ | 17 | libnetlink \ |
22 | ll_addr.o \ | 18 | ll_addr \ |
23 | ll_map.o \ | 19 | ll_map \ |
24 | ll_proto.o \ | 20 | ll_proto \ |
25 | ll_types.o \ | 21 | ll_types \ |
26 | rt_names.o \ | 22 | rt_names \ |
27 | rtm_map.o \ | 23 | rtm_map \ |
28 | utils.o | 24 | utils |
29 | 25 | ||
30 | LIBIPROUTE-$(CONFIG_IPADDR) += \ | 26 | LIBIPROUTE-$(CONFIG_IPADDR) += \ |
31 | ip_parse_common_args.o \ | 27 | ip_parse_common_args \ |
32 | ipaddress.o \ | 28 | ipaddress \ |
33 | libnetlink.o \ | 29 | libnetlink \ |
34 | ll_addr.o \ | 30 | ll_addr \ |
35 | ll_map.o \ | 31 | ll_map \ |
36 | ll_types.o \ | 32 | ll_types \ |
37 | rt_names.o \ | 33 | rt_names \ |
38 | utils.o | 34 | utils |
39 | 35 | ||
40 | LIBIPROUTE-$(CONFIG_IPLINK) += \ | 36 | LIBIPROUTE-$(CONFIG_IPLINK) += \ |
41 | ip_parse_common_args.o \ | 37 | ip_parse_common_args \ |
42 | ipaddress.o \ | 38 | ipaddress \ |
43 | iplink.o \ | 39 | iplink \ |
44 | libnetlink.o \ | 40 | libnetlink \ |
45 | ll_addr.o \ | 41 | ll_addr \ |
46 | ll_map.o \ | 42 | ll_map \ |
47 | ll_types.o \ | 43 | ll_types \ |
48 | rt_names.o \ | 44 | rt_names \ |
49 | utils.o | 45 | utils |
50 | 46 | ||
51 | LIBIPROUTE-$(CONFIG_IPROUTE) += \ | 47 | LIBIPROUTE-$(CONFIG_IPROUTE) += \ |
52 | ip_parse_common_args.o \ | 48 | ip_parse_common_args \ |
53 | iproute.o \ | 49 | iproute \ |
54 | libnetlink.o \ | 50 | libnetlink \ |
55 | ll_map.o \ | 51 | ll_map \ |
56 | rt_names.o \ | 52 | rt_names \ |
57 | rtm_map.o \ | 53 | rtm_map \ |
58 | utils.o | 54 | utils |
59 | 55 | ||
60 | LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ | 56 | LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ |
61 | ip_parse_common_args.o \ | 57 | ip_parse_common_args \ |
62 | iptunnel.o \ | 58 | iptunnel \ |
63 | rt_names.o \ | 59 | rt_names \ |
64 | utils.o | 60 | utils |
65 | 61 | ||
66 | LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y)) | 62 | LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y)) |
67 | 63 | ||
68 | LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y))) | 64 | LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBIPROUTE-y)) |
69 | LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c) | 65 | LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c) |
70 | LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y) | 66 | LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y) |
71 | LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) | 67 | LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) |
72 | 68 | ||
73 | LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) | 69 | networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) |
74 | 70 | ||
75 | # We do not need to build an empty non-pic object/archive | ||
76 | ifneq ($(strip $(LIBIPROUTE-y)),) | ||
77 | libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) | ||
78 | endif | ||
79 | |||
80 | # If we are building libbusybox.so _and_ we will use it ourselves then we | ||
81 | # keep it as small as possible | ||
82 | ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) | ||
83 | ifneq ($(strip $(LIBIPROUTE-y)),) | ||
84 | libraries-m+=$(LIBIPROUTE-multi-pic) | ||
85 | endif | ||
86 | endif | ||
87 | |||
88 | $(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)/%,$(LIBIPROUTE-y)) | ||
89 | $(do_ar) | ||
90 | |||
91 | $(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c | ||
92 | $(compile.c) | ||
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in index df32247c6..ca00b647d 100644 --- a/networking/udhcp/Makefile.in +++ b/networking/udhcp/Makefile.in | |||
@@ -3,13 +3,9 @@ | |||
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 | # | ||
7 | 6 | ||
8 | UDHCP_AR:=udhcp.a | ||
9 | ifndef $(UDHCP_DIR) | ||
10 | UDHCP_DIR:=$(top_builddir)/networking/udhcp/ | ||
11 | endif | ||
12 | srcdir=$(top_srcdir)/networking/udhcp | 7 | srcdir=$(top_srcdir)/networking/udhcp |
8 | objdir=$(top_builddir)/networking/udhcp | ||
13 | 9 | ||
14 | #ok, so I forgot how to do an or, but this is a quick and dirty hack | 10 | #ok, so I forgot how to do an or, but this is a quick and dirty hack |
15 | ifeq ($(strip $(CONFIG_UDHCPC)),y) | 11 | ifeq ($(strip $(CONFIG_UDHCPC)),y) |
@@ -22,32 +18,73 @@ CONFIG_UDHCP_SHARED=n | |||
22 | endif | 18 | endif |
23 | endif | 19 | endif |
24 | 20 | ||
25 | UDHCP-y:= | 21 | UDHCP__SHARED_FILES:=common.c options.c packet.c pidfile.c signalpipe.c socket.c |
26 | UDHCP-$(CONFIG_UDHCP_SHARED) += common.c options.c packet.c pidfile.c \ | 22 | UDHCP__UDHCPC_FILES:=dhcpc.c clientpacket.c clientsocket.c script.c |
27 | signalpipe.c socket.c | 23 | UDHCP__UDHCPD_FILES:=dhcpd.c arpping.c files.c leases.c serverpacket.c \ |
28 | UDHCP-$(CONFIG_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \ | 24 | static_leases.c |
29 | script.c | 25 | UDHCP__DUMPLEASES_FILES:=dumpleases.c |
30 | UDHCP-$(CONFIG_UDHCPD) += dhcpd.c arpping.c files.c leases.c \ | 26 | |
31 | serverpacket.c static_leases.c | 27 | UDHCP-$(CONFIG_UDHCP_SHARED) += $(UDHCP__SHARED_FILES) |
32 | UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.c | 28 | UDHCP-$(CONFIG_UDHCPC) += $(UDHCP__UDHCPC_FILES) |
33 | UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y)) | 29 | UDHCP-$(CONFIG_UDHCPD) += $(UDHCP__UDHCPD_FILES) |
34 | 30 | UDHCP-$(CONFIG_DUMPLEASES) += $(UDHCP__DUMPLEASES_FILES) | |
35 | ifneq ($(strip $(UDHCP-y)),) | ||
36 | libraries-y+=$(UDHCP_DIR)$(UDHCP_AR) | ||
37 | endif | ||
38 | 31 | ||
39 | UDHCP-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y)) | 32 | UDHCP_SRC-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y)) |
40 | UDHCP-a:=$(wildcard $(srcdir)/*.c) | 33 | UDHCP_SRC-a:=$(wildcard $(srcdir)/*.c) |
41 | APPLET_SRC-y+=$(UDHCP-y) | 34 | APPLET_SRC-y+=$(UDHCP_SRC-y) |
42 | APPLET_SRC-a+=$(UDHCP-a) | 35 | APPLET_SRC-a+=$(UDHCP_SRC-a) |
43 | 36 | ||
44 | UDHCP_INCLUDES:=$(srcdir) | 37 | UDHCP_INCLUDES:=$(srcdir) |
45 | 38 | ||
46 | APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) | 39 | #APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES) -DIN_BUSYBOX |
47 | APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) | 40 | #APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES) -DIN_BUSYBOX |
41 | |||
42 | CFLAGS-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 | |||
62 | ifeq ($(CONFIG_UDHCP_SHARED),y) | ||
63 | CFLAGS-udhcp-common.c:=-DIN_BUSYBOX | ||
64 | CFLAGS-udhcp-options.c:=-DIN_BUSYBOX | ||
65 | CFLAGS-udhcp-packet.c:=-DIN_BUSYBOX | ||
66 | CFLAGS-udhcp-pidfile.c:=-DIN_BUSYBOX | ||
67 | CFLAGS-udhcp-signalpipe.c:=-DIN_BUSYBOX | ||
68 | CFLAGS-udhcp-socket.c:=-DIN_BUSYBOX | ||
69 | endif | ||
70 | ifeq ($(CONFIG_UDHCPC),y) | ||
71 | CFLAGS-udhcp-dhcpc.c:=-DIN_BUSYBOX | ||
72 | CFLAGS-udhcp-clientpacket.c:=-DIN_BUSYBOX | ||
73 | CFLAGS-udhcp-clientsocket.c:=-DIN_BUSYBOX | ||
74 | CFLAGS-udhcp-script.c:=-DIN_BUSYBOX | ||
75 | endif | ||
76 | ifeq ($(CONFIG_UDHCPD),y) | ||
77 | CFLAGS-udhcp-dhcpd.c:=-DIN_BUSYBOX | ||
78 | CFLAGS-udhcp-arpping.c:=-DIN_BUSYBOX | ||
79 | CFLAGS-udhcp-files.c:=-DIN_BUSYBOX | ||
80 | CFLAGS-udhcp-leases.c:=-DIN_BUSYBOX | ||
81 | CFLAGS-udhcp-serverpacket.c:=-DIN_BUSYBOX | ||
82 | CFLAGS-udhcp-static_leases.c:=-DIN_BUSYBOX | ||
83 | endif | ||
84 | ifeq ($(CONFIG_DUMPLEASES),y) | ||
85 | CFLAGS-udhcp-dumpleases.c:=-DIN_BUSYBOX | ||
86 | endif | ||
87 | |||
48 | 88 | ||
49 | $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) | 89 | networking_udhcp_OBJ:=$(patsubst %.c,$(objdir)/%.o,$(UDHCP-y)) |
50 | $(do_ar) | ||
51 | 90 | ||
52 | $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c | ||
53 | $(compile.c) -DIN_BUSYBOX | ||