diff options
| author | Andrea Claudi <aclaudi@redhat.com> | 2022-03-09 18:03:26 +0100 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-03-12 09:00:56 -0700 |
| commit | 93fb6810e1467511007c155a1aa503139496464a (patch) | |
| tree | aeeaf7f659726e8cf437b634c5121a65ee74dd29 | |
| parent | 4bff7017740a2dd0a1bcf299b31761b40d971586 (diff) | |
| download | iproute2-93fb6810e1467511007c155a1aa503139496464a.tar.gz | |
Makefile: move HAVE_MNL check to top-level Makefile
dcb, devlink, rdma, tipc and vdpa rely on libmnl to compile, so they
check for libmnl to be installed on their Makefiles.
This moves HAVE_MNL check from the tools to top-level Makefile, thus
avoiding to call their Makefiles if libmnl is not present.
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | dcb/Makefile | 6 | ||||
| -rw-r--r-- | devlink/Makefile | 6 | ||||
| -rw-r--r-- | rdma/Makefile | 4 | ||||
| -rw-r--r-- | tipc/Makefile | 6 | ||||
| -rw-r--r-- | vdpa/Makefile | 6 |
6 files changed, 4 insertions, 29 deletions
@@ -65,7 +65,10 @@ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v -SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa +SUBDIRS=lib ip tc bridge misc netem genl man +ifeq ($(HAVE_MNL),y) +SUBDIRS += tipc devlink rdma dcb vdpa +endif LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a LDLIBS += $(LIBNETLINK) diff --git a/dcb/Makefile b/dcb/Makefile index 3a2e5d4c4..ca65d4670 100644 --- a/dcb/Makefile +++ b/dcb/Makefile @@ -1,10 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk -TARGETS := - -ifeq ($(HAVE_MNL),y) - DCBOBJ = dcb.o \ dcb_app.o \ dcb_buffer.o \ @@ -15,8 +11,6 @@ DCBOBJ = dcb.o \ TARGETS += dcb LDLIBS += -lm -endif - all: $(TARGETS) $(LIBS) dcb: $(DCBOBJ) $(LIBNETLINK) diff --git a/devlink/Makefile b/devlink/Makefile index d37a4b4d0..1a1eed7ef 100644 --- a/devlink/Makefile +++ b/devlink/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk -TARGETS := - -ifeq ($(HAVE_MNL),y) - DEVLINKOBJ = devlink.o mnlg.o TARGETS += devlink LDLIBS += -lm -endif - all: $(TARGETS) $(LIBS) devlink: $(DEVLINKOBJ) $(LIBNETLINK) diff --git a/rdma/Makefile b/rdma/Makefile index 9154efeb2..37d904a7e 100644 --- a/rdma/Makefile +++ b/rdma/Makefile @@ -1,16 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB include ../config.mk -TARGETS := - -ifeq ($(HAVE_MNL),y) CFLAGS += -I./include/uapi/ RDMA_OBJ = rdma.o utils.o dev.o link.o res.o res-pd.o res-mr.o res-cq.o \ res-cmid.o res-qp.o sys.o stat.o stat-mr.o res-ctx.o res-srq.o TARGETS += rdma -endif all: $(TARGETS) $(LIBS) diff --git a/tipc/Makefile b/tipc/Makefile index a10debe08..4f0aba7ed 100644 --- a/tipc/Makefile +++ b/tipc/Makefile @@ -1,10 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk -TARGETS := - -ifeq ($(HAVE_MNL),y) - TIPCOBJ=bearer.o \ cmdl.o link.o \ media.o misc.o \ @@ -14,8 +10,6 @@ TIPCOBJ=bearer.o \ TARGETS += tipc -endif - all: $(TARGETS) $(LIBS) tipc: $(TIPCOBJ) diff --git a/vdpa/Makefile b/vdpa/Makefile index 253e20a7d..86f7221e6 100644 --- a/vdpa/Makefile +++ b/vdpa/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk -TARGETS := - -ifeq ($(HAVE_MNL),y) - CFLAGS += -I./include/uapi/ VDPAOBJ = vdpa.o TARGETS += vdpa -endif - all: $(TARGETS) $(LIBS) vdpa: $(VDPAOBJ) |