From: Matthias Schiffer Date: Wed, 3 Jan 2018 15:28:52 +0000 (+0100) Subject: devlink, rdma, tipc: properly define TARGETS without HAVE_MNL X-Git-Tag: v4.15.0~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd6ccbfd0311d01a29b490c472ad79b6ad8036b;p=thirdparty%2Fiproute2.git devlink, rdma, tipc: properly define TARGETS without HAVE_MNL Leaving a variable with a generic name such as TARGETS undefined would lead to Make picking up its value from the environment. Avoid this by always defining TARGETS in the Makefiles. Signed-off-by: Matthias Schiffer --- diff --git a/devlink/Makefile b/devlink/Makefile index 3afda65e6..ace34c7b0 100644 --- a/devlink/Makefile +++ b/devlink/Makefile @@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +TARGETS := + ifeq ($(HAVE_MNL),y) DEVLINKOBJ = devlink.o mnlg.o -TARGETS=devlink +TARGETS += devlink CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags) LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs) diff --git a/rdma/Makefile b/rdma/Makefile index c8966bfda..454f25f86 100644 --- a/rdma/Makefile +++ b/rdma/Makefile @@ -1,11 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +TARGETS := + ifeq ($(HAVE_MNL),y) RDMA_OBJ = rdma.o utils.o dev.o link.o -TARGETS=rdma +TARGETS += rdma endif all: $(TARGETS) $(LIBS) diff --git a/tipc/Makefile b/tipc/Makefile index abd33ab07..fdb18d39b 100644 --- a/tipc/Makefile +++ b/tipc/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +TARGETS := + ifeq ($(HAVE_MNL),y) TIPCOBJ=bearer.o \ @@ -10,7 +12,7 @@ TIPCOBJ=bearer.o \ node.o socket.o \ peer.o tipc.o -TARGETS=tipc +TARGETS += tipc endif