From 6299c64cf3351fb1935319378aed421e26ed2f90 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 13 Jan 2018 19:51:31 -0500 Subject: Use correct link directory order (fixes #158) Make sure to link from the source tree before linking from the system. In many environments, this is necessary to allow a newly built qpdf to link properly instead of trying to link or resolve libraries from an older installed version. --- ChangeLog | 3 +++ examples/build.mk | 2 +- libtests/build.mk | 2 +- qpdf/build.mk | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c023bd3..14a9b928 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2018-01-13 Jay Berkenbilt + * Fix link order in the build to avoid conflicts when building + from source while an older version of qpdf is installed. + * Add support for TIFF predictor for LZW and Flate streams. Now all predictor functions are supported. diff --git a/examples/build.mk b/examples/build.mk index bd2119a5..518f4d55 100644 --- a/examples/build.mk +++ b/examples/build.mk @@ -39,4 +39,4 @@ $(foreach B,$(CBINS_examples),$(eval \ $(foreach B,$(BINS_examples) $(CBINS_examples),$(eval \ examples/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \ - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS)))) + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS)))) diff --git a/libtests/build.mk b/libtests/build.mk index 4579241d..1eebd8fb 100644 --- a/libtests/build.mk +++ b/libtests/build.mk @@ -43,4 +43,4 @@ $(foreach B,$(BINS_libtests),$(eval \ $(foreach B,$(BINS_libtests),$(eval \ libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \ - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS) $(LIBS_libqpdf)))) + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS) $(LIBS_libqpdf)))) diff --git a/qpdf/build.mk b/qpdf/build.mk index e3d50976..893bbbd1 100644 --- a/qpdf/build.mk +++ b/qpdf/build.mk @@ -30,4 +30,4 @@ $(foreach B,$(CBINS_qpdf),$(eval \ $(foreach B,$(BINS_qpdf) $(CBINS_qpdf),$(eval \ qpdf/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \ - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS)))) + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS)))) -- cgit v1.2.3-54-g00ecf