summaryrefslogtreecommitdiffstats
path: root/tipc
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2017-08-10 17:05:03 -0700
committerStephen Hemminger <stephen@networkplumber.org>2017-08-23 10:03:09 -0700
commit5f1df307b47f7f0b28a29d85418a3934cc3a83b2 (patch)
tree77853c3de06be5f0eae9f15cb20736829262c4ae /tipc
parent51186362ba95d7fc4f97ef7763718e1b5d236056 (diff)
config: put CFLAGS/LDLIBS in config.mk
This renames Config to config.mk and includes more Make input. Now configure generates all the required CFLAGS and LDLIBS for the optional libraries. Also, use pkg-config to test for libelf, rather than using a test program. This makes it consistent with other libraries. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'tipc')
-rw-r--r--tipc/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/tipc/Makefile b/tipc/Makefile
index 87e3cac3..2212beb0 100644
--- a/tipc/Makefile
+++ b/tipc/Makefile
@@ -1,4 +1,5 @@
-include ../Config
+include ../config.mk
+
ifeq ($(HAVE_MNL),y)
TIPCOBJ=bearer.o \
@@ -8,8 +9,6 @@ TIPCOBJ=bearer.o \
node.o socket.o \
peer.o tipc.o
-include ../Config
-
TARGETS=tipc
CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)