diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2018-02-04 20:01:57 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2018-02-04 20:19:00 +0100 |
| commit | 95ba7125ffa4efd4022fd27ab61ff739b0864258 (patch) | |
| tree | a1a6de58a5b452a685b50bdcab59905812a5ce14 /make | |
| parent | 3b2a3cdd77957e90ab8c07094666d8bdd2e43993 (diff) | |
| download | qpdf-95ba7125ffa4efd4022fd27ab61ff739b0864258.tar.zst | |
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.
Diffstat (limited to 'make')
| -rw-r--r-- | make/libtool.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |