From 74a4c7432d8e8d5e336c30c6fe2fb8602bb6cc10 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 20 Sep 2021 23:41:28 +0000 Subject: [PATCH] use shared libtirpc Signed-off-by: Ben Cressey Signed-off-by: Arnaldo Garcia Rincon --- Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6fb6976..2c7cc93 100644 --- a/Makefile +++ b/Makefile @@ -165,9 +165,8 @@ else LIB_LDLIBS_STATIC += -l:libelf.a endif ifeq ($(WITH_TIRPC), yes) -LIB_CPPFLAGS += -isystem $(DEPS_DIR)$(includedir)/tirpc -DWITH_TIRPC -LIB_LDLIBS_STATIC += -l:libtirpc.a -LIB_LDLIBS_SHARED += -lpthread +LIB_CPPFLAGS += -DWITH_TIRPC +LIB_LDLIBS_SHARED += -ltirpc endif ifeq ($(WITH_SECCOMP), yes) LIB_CPPFLAGS += -DWITH_SECCOMP $(shell pkg-config --cflags libseccomp) @@ -265,9 +264,6 @@ endif ifeq ($(WITH_LIBELF), no) $(MAKE) -f $(MAKE_DIR)/elftoolchain.mk DESTDIR=$(DEPS_DIR) install endif -ifeq ($(WITH_TIRPC), yes) - $(MAKE) -f $(MAKE_DIR)/libtirpc.mk DESTDIR=$(DEPS_DIR) install -endif install: all $(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(docdir) $(libdbgdir) $(pkgconfdir)) @@ -323,9 +319,6 @@ endif ifeq ($(WITH_LIBELF), no) -$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean endif -ifeq ($(WITH_TIRPC), yes) - -$(MAKE) -f $(MAKE_DIR)/libtirpc.mk clean -endif mostlyclean: $(RM) $(LIB_OBJS) $(LIB_STATIC_OBJ) $(BIN_OBJS) $(DEPENDENCIES) -- 2.37.1