- revert back to r14406

author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 2006-03-13 19:04:00 +0000
committer: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 2006-03-13 19:04:00 +0000
commit: df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree: 49493696039b285aa751a5bc884fc70c9c85e878 /networking/libiproute
parent: c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
download: busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip
1 files changed, 58 insertions, 48 deletions
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 @@
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+#
-srcdir:=$(top_srcdir)/networking/libiproute
+LIBIPROUTE_AR:=libiproute.a
-objdir:=$(top_builddir)/networking/libiproute
+ifndef $(LIBIPROUTE_DIR)
+LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute
+endif
+srcdir=$(top_srcdir)/networking/libiproute
+LIBIPROUTE-y:=
 LIBIPROUTE-$(CONFIG_IP) += \
-        ip_parse_common_args \
+        ip_parse_common_args.o \
-        ipaddress \
+        ipaddress.o \
-        iplink \
+        iplink.o \
-        iproute \
+        iproute.o \
-        iptunnel \
+        iptunnel.o \
-        libnetlink \
+        libnetlink.o \
-        ll_addr \
+        ll_addr.o \
-        ll_map \
+        ll_map.o \
-        ll_proto \
+        ll_proto.o \
-        ll_types \
+        ll_types.o \
-        rt_names \
+        rt_names.o \
-        rtm_map \
+        rtm_map.o \
-        utils
+        utils.o
 LIBIPROUTE-$(CONFIG_IPADDR) += \
-        ip_parse_common_args \
+        ip_parse_common_args.o \
-        ipaddress \
+        ipaddress.o \
-        libnetlink \
+        libnetlink.o \
-        ll_addr \
+        ll_addr.o \
-        ll_map \
+        ll_map.o \
-        ll_types \
+        ll_types.o \
-        rt_names \
+        rt_names.o \
-        utils
+        utils.o
 LIBIPROUTE-$(CONFIG_IPLINK) += \
-        ip_parse_common_args \
+        ip_parse_common_args.o \
-        ipaddress \
+        ipaddress.o \
-        iplink \
+        iplink.o \
-        libnetlink \
+        libnetlink.o \
-        ll_addr \
+        ll_addr.o \
-        ll_map \
+        ll_map.o \
-        ll_types \
+        ll_types.o \
-        rt_names \
+        rt_names.o \
-        utils
+        utils.o
 LIBIPROUTE-$(CONFIG_IPROUTE) += \
-        ip_parse_common_args \
+        ip_parse_common_args.o \
-        iproute \
+        iproute.o \
-        libnetlink \
+        libnetlink.o \
-        ll_map \
+        ll_map.o \
-        rt_names \
+        rt_names.o \
-        rtm_map \
+        rtm_map.o \
-        utils
+        utils.o
 LIBIPROUTE-$(CONFIG_IPTUNNEL) += \
-        ip_parse_common_args \
+        ip_parse_common_args.o \
-        iptunnel \
+        iptunnel.o \
-        rt_names \
+        rt_names.o \
-        utils
+        utils.o
 LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y))
-LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBIPROUTE-y))
+LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y)))
 LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c)
 LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y)
 LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a)
-networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y))
+LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
+ifneq ($(strip $(LIBIPROUTE-y)),)
+libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
+endif
-$(networking_libiproute_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c
+$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)/%,$(LIBIPROUTE-y))
-$(objdir)/libiproute.a: $(networking_libiproute_OBJ$(os))
+        $(do_ar)
-libraries-y:=$(libraries-y) $(objdir)/libiproute.a
+$(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c
+        $(compile.c)
author	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>	2006-03-13 19:04:00 +0000
committer	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>	2006-03-13 19:04:00 +0000
commit	df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree	49493696039b285aa751a5bc884fc70c9c85e878 /networking/libiproute
parent	c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
download	busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2 busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip

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
7	srcdir:=$(top_srcdir)/networking/libiproute	8	LIBIPROUTE_AR:=libiproute.a
8	objdir:=$(top_builddir)/networking/libiproute	9	ifndef $(LIBIPROUTE_DIR)
		10	LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute
		11	endif
		12	srcdir=$(top_srcdir)/networking/libiproute
9		13
		14	LIBIPROUTE-y:=
10	LIBIPROUTE-$(CONFIG_IP) += \	15	LIBIPROUTE-$(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
25	LIBIPROUTE-$(CONFIG_IPADDR) += \	30	LIBIPROUTE-$(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
35	LIBIPROUTE-$(CONFIG_IPLINK) += \	40	LIBIPROUTE-$(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
46	LIBIPROUTE-$(CONFIG_IPROUTE) += \	51	LIBIPROUTE-$(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
55	LIBIPROUTE-$(CONFIG_IPTUNNEL) += \	60	LIBIPROUTE-$(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
61	LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y))	66	LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y))
62		67
63	LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBIPROUTE-y))	68	LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y)))
64	LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c)	69	LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c)
65	LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y)	70	LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y)
66	LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a)	71	LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a)
67		72
68	networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y))	73	LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
		74
		75	ifneq ($(strip $(LIBIPROUTE-y)),)
		76	libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR)
		77	endif
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)
72	libraries-y:=$(libraries-y) $(objdir)/libiproute.a
73		81
		82	$(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c
		83	$(compile.c)