Commit 6299c64cf3351fb1935319378aed421e26ed2f90

Authored by Jay Berkenbilt
1 parent ec0087e3

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
1 1 2018-01-13 Jay Berkenbilt <ejb@ql.org>
2 2  
  3 + * Fix link order in the build to avoid conflicts when building
  4 + from source while an older version of qpdf is installed.
  5 +
3 6 * Add support for TIFF predictor for LZW and Flate streams. Now
4 7 all predictor functions are supported.
5 8  
... ...
examples/build.mk
... ... @@ -39,4 +39,4 @@ $(foreach B,$(CBINS_examples),$(eval \
39 39  
40 40 $(foreach B,$(BINS_examples) $(CBINS_examples),$(eval \
41 41 examples/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
42   - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))
  42 + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
... ...
libtests/build.mk
... ... @@ -43,4 +43,4 @@ $(foreach B,$(BINS_libtests),$(eval \
43 43  
44 44 $(foreach B,$(BINS_libtests),$(eval \
45 45 libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
46   - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS) $(LIBS_libqpdf))))
  46 + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS) $(LIBS_libqpdf))))
... ...
qpdf/build.mk
... ... @@ -30,4 +30,4 @@ $(foreach B,$(CBINS_qpdf),$(eval \
30 30  
31 31 $(foreach B,$(BINS_qpdf) $(CBINS_qpdf),$(eval \
32 32 qpdf/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
33   - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))
  33 + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
... ...