From 07a79e75f502ebd41e5341aacc5de303d3ffaea0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 9 Mar 2006 09:03:37 +0000 Subject: - backout using features which are not available with the previous stable version of make (3.71.1). --- networking/Makefile.in | 8 ++++++-- networking/libiproute/Makefile.in | 9 ++++++--- networking/udhcp/Makefile.in | 8 ++++++-- 3 files changed, 18 insertions(+), 7 deletions(-) (limited to 'networking') 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 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -srcdir=$(top_srcdir)/networking -objdir=$(top_builddir)/networking +srcdir:=$(top_srcdir)/networking +objdir:=$(top_builddir)/networking NETWORKING-$(CONFIG_ARPING) += arping.o NETWORKING-$(CONFIG_DNSD) += dnsd.o @@ -57,3 +57,7 @@ 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 + 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 @@ # Copyright (C) 1999-2004 by Erik Andersen # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -# -srcdir=$(top_srcdir)/networking/libiproute -objdir=$(top_builddir)/networking/libiproute +srcdir:=$(top_srcdir)/networking/libiproute +objdir:=$(top_builddir)/networking/libiproute LIBIPROUTE-$(CONFIG_IP) += \ ip_parse_common_args \ @@ -68,3 +67,7 @@ LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) +$(networking_libiproute_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c +$(objdir)/networking.a: $(networking_libiproute_OBJ$(os)) +libraries-y:=$(libraries-y) $(objdir)/networking.a + 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 @@ # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -srcdir=$(top_srcdir)/networking/udhcp -objdir=$(top_builddir)/networking/udhcp +srcdir:=$(top_srcdir)/networking/udhcp +objdir:=$(top_builddir)/networking/udhcp #ok, so I forgot how to do an or, but this is a quick and dirty hack ifeq ($(strip $(CONFIG_UDHCPC)),y) @@ -88,3 +88,7 @@ endif networking_udhcp_OBJ:=$(patsubst %.c,$(objdir)/%.o,$(UDHCP-y)) +$(networking_udhcp_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/udhcp.a: $(networking_udhcp_OBJ) +libraries-y:=$(libraries-y) $(objdir)/udhcp.a + -- cgit v1.2.3