diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-09 09:03:37 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-09 09:03:37 +0000 |
commit | 07a79e75f502ebd41e5341aacc5de303d3ffaea0 (patch) | |
tree | 4b95f98bab0b298c5df171772b629d03400ef507 /networking | |
parent | 874af85d5eb08b65476f406f6a1e7edc127ac210 (diff) | |
download | busybox-w32-07a79e75f502ebd41e5341aacc5de303d3ffaea0.tar.gz busybox-w32-07a79e75f502ebd41e5341aacc5de303d3ffaea0.tar.bz2 busybox-w32-07a79e75f502ebd41e5341aacc5de303d3ffaea0.zip |
- backout using features which are not available with the previous stable
version of make (3.71.1).
Diffstat (limited to 'networking')
-rw-r--r-- | networking/Makefile.in | 8 | ||||
-rw-r--r-- | networking/libiproute/Makefile.in | 9 | ||||
-rw-r--r-- | networking/udhcp/Makefile.in | 8 |
3 files changed, 18 insertions, 7 deletions
diff --git a/networking/Makefile.in b/networking/Makefile.in index efad05053..80cfd1733 100644 --- a/networking/Makefile.in +++ b/networking/Makefile.in | |||
@@ -4,8 +4,8 @@ | |||
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 | srcdir=$(top_srcdir)/networking | 7 | srcdir:=$(top_srcdir)/networking |
8 | objdir=$(top_builddir)/networking | 8 | objdir:=$(top_builddir)/networking |
9 | 9 | ||
10 | NETWORKING-$(CONFIG_ARPING) += arping.o | 10 | NETWORKING-$(CONFIG_ARPING) += arping.o |
11 | NETWORKING-$(CONFIG_DNSD) += dnsd.o | 11 | NETWORKING-$(CONFIG_DNSD) += dnsd.o |
@@ -57,3 +57,7 @@ LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking | |||
57 | 57 | ||
58 | networking_OBJ:= $(patsubst %,$(objdir)/%,$(NETWORKING-y)) | 58 | networking_OBJ:= $(patsubst %,$(objdir)/%,$(NETWORKING-y)) |
59 | 59 | ||
60 | $(networking_OBJ): $(objdir)/%.o: $(srcdir)/%.c | ||
61 | $(objdir)/networking.a: $(networking_OBJ) | ||
62 | libraries-y:=$(libraries-y) $(objdir)/networking.a | ||
63 | |||
diff --git a/networking/libiproute/Makefile.in b/networking/libiproute/Makefile.in index 99fa22e9d..2fee2796d 100644 --- a/networking/libiproute/Makefile.in +++ b/networking/libiproute/Makefile.in | |||
@@ -3,10 +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 | srcdir=$(top_srcdir)/networking/libiproute | 7 | srcdir:=$(top_srcdir)/networking/libiproute |
9 | objdir=$(top_builddir)/networking/libiproute | 8 | objdir:=$(top_builddir)/networking/libiproute |
10 | 9 | ||
11 | LIBIPROUTE-$(CONFIG_IP) += \ | 10 | LIBIPROUTE-$(CONFIG_IP) += \ |
12 | ip_parse_common_args \ | 11 | ip_parse_common_args \ |
@@ -68,3 +67,7 @@ LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) | |||
68 | 67 | ||
69 | networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) | 68 | networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) |
70 | 69 | ||
70 | $(networking_libiproute_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c | ||
71 | $(objdir)/networking.a: $(networking_libiproute_OBJ$(os)) | ||
72 | libraries-y:=$(libraries-y) $(objdir)/networking.a | ||
73 | |||
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in index ca00b647d..210939fd6 100644 --- a/networking/udhcp/Makefile.in +++ b/networking/udhcp/Makefile.in | |||
@@ -4,8 +4,8 @@ | |||
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 | srcdir=$(top_srcdir)/networking/udhcp | 7 | srcdir:=$(top_srcdir)/networking/udhcp |
8 | objdir=$(top_builddir)/networking/udhcp | 8 | objdir:=$(top_builddir)/networking/udhcp |
9 | 9 | ||
10 | #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 |
11 | ifeq ($(strip $(CONFIG_UDHCPC)),y) | 11 | ifeq ($(strip $(CONFIG_UDHCPC)),y) |
@@ -88,3 +88,7 @@ endif | |||
88 | 88 | ||
89 | networking_udhcp_OBJ:=$(patsubst %.c,$(objdir)/%.o,$(UDHCP-y)) | 89 | networking_udhcp_OBJ:=$(patsubst %.c,$(objdir)/%.o,$(UDHCP-y)) |
90 | 90 | ||
91 | $(networking_udhcp_OBJ): $(objdir)/%.o: $(srcdir)/%.c | ||
92 | $(objdir)/udhcp.a: $(networking_udhcp_OBJ) | ||
93 | libraries-y:=$(libraries-y) $(objdir)/udhcp.a | ||
94 | |||