diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2018-01-14 01:51:31 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2018-01-14 01:53:52 +0100 |
| commit | 6299c64cf3351fb1935319378aed421e26ed2f90 (patch) | |
| tree | 1ed0ef9ee42de0fd6386c448cb3beab955e1a6f8 | |
| parent | ec0087e3ce2ae7554098b3506378ca3eb9d87795 (diff) | |
| download | qpdf-6299c64cf3351fb1935319378aed421e26ed2f90.tar.zst | |
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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | examples/build.mk | 2 | ||||
| -rw-r--r-- | libtests/build.mk | 2 | ||||
| -rw-r--r-- | qpdf/build.mk | 2 |
4 files changed, 6 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2018-01-13 Jay Berkenbilt <ejb@ql.org> + * 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)))) |