From 95ba7125ffa4efd4022fd27ab61ff739b0864258 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 4 Feb 2018 14:01:57 -0500 Subject: Fix link order (fixes #176) Specify qpdf libraries before external ones. Specify LDFLAGS before libraries. This should eliminate remaining cases of qpdf builds favoring previously installed versions. --- make/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make') diff --git a/make/libtool.mk b/make/libtool.mk index 98191bdd..e68bea4c 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -94,14 +94,14 @@ endef define makelib $(LIBTOOL) --mode=link \ $(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \ - -o $(2) $(1) $(4) $(3) \ + -o $(2) $(1) $(3) $(4) \ -rpath $(libdir) -version-info $(5):$(6):$(7) -no-undefined endef # 1 2 3 4 # Usage: $(call makebin,objs,binary,ldflags,libs) define makebin - $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3) + $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4) endef # Install target -- cgit v1.2.3-54-g00ecf