From 6f95c0b9be4f568bac9aa6ae3e197d2dd9c78688 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Fri, 1 Feb 2019 18:11:15 +0100 Subject: [PATCH] Adjust makefile that libtirpc.so used only when available --- libtrbnet/Makefile | 8 ++++++-- trbnetd/Makefile | 6 +++++- trbnetd/server/Makefile | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile index ac23e54..cbaf3e2 100644 --- a/libtrbnet/Makefile +++ b/libtrbnet/Makefile @@ -27,9 +27,13 @@ CPPFLAGS += #-DTRB_DEBUGGER #-DHEXMODE CFLAGS = -pipe -g -Wall -Winline -O3 -fPIC -finline-functions -finline-limit=600000 LD = $(CC) -LDFLAGS = -lm -ltirpc +LDFLAGS = LIBDIR = -LOADLIBES = +LOADLIBES = -lm + +ifneq ($(wildcard /usr/lib64/libtirpc.so),) +LOADLIBES += -ltirpc +endif # ------------ TARGETS ------------------------------------------------- diff --git a/trbnetd/Makefile b/trbnetd/Makefile index 01b0f76..72863e1 100644 --- a/trbnetd/Makefile +++ b/trbnetd/Makefile @@ -24,7 +24,11 @@ LD = $(CC) LDFLAGS = LIBDIR = -LOADLIBES = -lm -ltirpc +LOADLIBES = -lm + +ifneq ($(wildcard /usr/lib64/libtirpc.so),) +LOADLIBES += -ltirpc +endif # ------------ TARGETS ------------------------------------------------- diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile index 1772dff..23905a5 100644 --- a/trbnetd/server/Makefile +++ b/trbnetd/server/Makefile @@ -31,10 +31,14 @@ CXXFLAGS = -pipe -g -Wall LD = $(CC) #LD = $(CXX) -LDFLAGS = -ltirpc +LDFLAGS = LIBDIR = -L../../libtrbnet LOADLIBES = -Wl,-Bstatic -ltrbnet -Wl,-Bdynamic -lm +ifneq ($(wildcard /usr/lib64/libtirpc.so),) +LOADLIBES += -ltirpc +endif + # ------------ TARGETS ------------------------------------------------- TARGETS = trbnetd -- 2.43.0