From: Serhey Popovych Date: Thu, 15 Feb 2018 21:23:21 +0000 (+0200) Subject: lib: Correct object file dependencies X-Git-Tag: v4.17.0~81^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cec58dac4c249a6773a39e00b0f13530534cda7;p=thirdparty%2Fiproute2.git lib: Correct object file dependencies Neither internal libnetlink nor libgenl depends on ll_map.o: prepare for upcoming changes that brings much more cleaner dependency between utils.o and ll_map.o. However ll_map.o depends on libnetlink.o functions so we need to provide libnetlink.a after libutil.a in LIBNETLINK at global Makefile. Tested using make clean && make -j4. No problems so far. Signed-off-by: Serhey Popovych Signed-off-by: David Ahern --- diff --git a/Makefile b/Makefile index 32587db3b..b526d3b5b 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ YACCFLAGS = -d -t -v SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man -LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a +LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a LDLIBS += $(LIBNETLINK) all: config.mk diff --git a/lib/Makefile b/lib/Makefile index 7b34ed5f8..bab8cbf51 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -3,11 +3,11 @@ include ../config.mk CFLAGS += -fPIC -UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \ +UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ inet_proto.o namespace.o json_writer.o json_print.o \ names.o color.o bpf.o exec.o fs.o -NLOBJ=libgenl.o ll_map.o libnetlink.o +NLOBJ=libgenl.o libnetlink.o all: libnetlink.a libutil.a