matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2018-01-03 16:28:52 +01:00 committed by Stephen Hemminger
parent c7d6cbaf85
commit cfd6ccbfd0
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devlink/Makefile
View File

@ -1,10 +1,12 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
include ../config.mk include ../config.mk
TARGETS :=
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
DEVLINKOBJ = devlink.o mnlg.o DEVLINKOBJ = devlink.o mnlg.o
TARGETS=devlink TARGETS += devlink
CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags) CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs) LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)

4
rdma/Makefile
View File

@ -1,11 +1,13 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
include ../config.mk include ../config.mk
TARGETS :=
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
RDMA_OBJ = rdma.o utils.o dev.o link.o RDMA_OBJ = rdma.o utils.o dev.o link.o
TARGETS=rdma TARGETS += rdma
endif endif
all: $(TARGETS) $(LIBS) all: $(TARGETS) $(LIBS)

4
tipc/Makefile
View File

@ -1,6 +1,8 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
include ../config.mk include ../config.mk
TARGETS :=
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
TIPCOBJ=bearer.o \ TIPCOBJ=bearer.o \
@ -10,7 +12,7 @@ TIPCOBJ=bearer.o \
node.o socket.o \ node.o socket.o \
peer.o tipc.o peer.o tipc.o
TARGETS=tipc TARGETS += tipc
endif endif