---- mupdf-1.6-source/Makefile.orig 2014-09-30 13:25:12.000000000 +0200
-+++ mupdf-1.6-source/Makefile 2014-11-28 23:35:04.957817554 +0100
-@@ -44,17 +44,24 @@
- ifneq "$(verbose)" "yes"
- QUIET_AR = @ echo ' ' ' ' AR $@ ;
- QUIET_CC = @ echo ' ' ' ' CC $@ ;
-+QUIET_LTCC = @ echo ' ' ' ' LTCC $@ ;
- QUIET_CXX = @ echo ' ' ' ' CXX $@ ;
-+QUIET_LTCXX = @ echo ' ' ' ' LTCXX $@ ;
- QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
- QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
-+QUIET_LTLINK = @ echo ' ' ' ' LTLINK $@ ;
- QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
- QUIET_RM = @ echo ' ' ' ' RM $@ ;
- endif
-
- CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
-+LTCC_CMD = $(QUIET_LTCC) libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<
- CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
-+LTCXX_CMD = $(QUIET_CXX) libtool --mode=compile --tag=CXX $(CXX) $(CFLAGS) -o $@ -c $<
- AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
- LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+LTLINK_CMD = $(QUIET_LINK) libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+LTLINKCXX_CMD = $(QUIET_LINK) libtool --mode=link --tag=CXX $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
- RM_CMD = $(QUIET_RM) rm -f $@
-
-@@ -90,47 +97,47 @@
- IMG_SRC_HDR := $(wildcard source/img/*.h)
- TIFF_SRC_HDR := $(wildcard source/tiff/*.h)
-
--FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
--PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
--XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
--CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
--IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(IMG_SRC))))
--TIFF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(TIFF_SRC))))
-+FITZ_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
-+PDF_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
-+XPS_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
-+CBZ_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
-+IMG_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(IMG_SRC))))
-+TIFF_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(TIFF_SRC))))
-
- # --- Choice of Javascript library ---
-
- ifeq "$(HAVE_MUJS)" "yes"
--PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
--PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo
- THIRD_LIBS += $(MUJS_LIB)
- LIBS += $(MUJS_LIBS)
- CFLAGS += $(MUJS_CFLAGS)
- else ifeq "$(HAVE_JSCORE)" "yes"
--PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
--PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.o
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.lo
- LIBS += $(JSCORE_LIBS)
- CFLAGS += $(JSCORE_CFLAGS)
- else ifeq "$(HAVE_V8)" "yes"
--PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
--PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
-+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo
- LIBS += $(V8_LIBS)
- CFLAGS += $(V8_CFLAGS)
+--- mupdf-1.16.1-source/Makefile.orig 2019-08-02 16:49:26.000000000 +0200
++++ mupdf-1.16.1-source/Makefile 2019-08-03 16:42:46.407735805 +0200
+@@ -41,9 +41,12 @@
+ QUIET_AR = @ echo " AR $@" ;
+ QUIET_RANLIB = @ echo " RANLIB $@" ;
+ QUIET_CC = @ echo " CC $@" ;
++ QUIET_LTCC = @ echo " LTCC $@" ;
+ QUIET_CXX = @ echo " CXX $@" ;
++ QUIET_LTCXX = @ echo " LTCXX $@" ;
+ QUIET_GEN = @ echo " GEN $@" ;
+ QUIET_LINK = @ echo " LINK $@" ;
++ QUIET_LTLINK = @ echo " LTLINK $@" ;
+ QUIET_RM = @ echo " RM $@" ;
+ QUIET_TAGS = @ echo " TAGS $@" ;
+ QUIET_WINDRES = @ echo " WINDRES $@" ;
+@@ -52,12 +55,16 @@
+
+ MKTGTDIR = mkdir -p $(dir $@)
+ CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
++LTCC_CMD = $(QUIET_LTCC) libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
+ CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
++LTCXX_CMD = $(QUIET_CXX) libtool --mode=compile --tag=CXX $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
+ AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
+ ifdef RANLIB
+ RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
+ endif
+ LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++LTLINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++LTLINKCXX_CMD = $(QUIET_LINK) $(MKTGTDIR) ; libtool --mode=link --tag=CXX $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+ TAGS_CMD = $(QUIET_TAGS) ctags -R
+ WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
+ OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
+@@ -68,6 +75,9 @@
+ $(AR_CMD)
+ $(RANLIB_CMD)
+
++$(OUT)/%.la :
++ $(LTLINK_CMD) -rpath $(libdir) $(LDLIBS)
++
+ $(OUT)/%.exe: %.c
+ $(LINK_CMD)
+
+@@ -93,13 +103,16 @@
+ $(CC_CMD) -Wall $(THIRD_CFLAGS) $(GLUT_CFLAGS)
+
+ ifeq ($(HAVE_OBJCOPY),yes)
+- $(OUT)/source/fitz/noto.o : source/fitz/noto.c
+- $(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
++ $(OUT)/source/fitz/noto.lo : source/fitz/noto.c
++ $(LTCC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
+ endif
+
+ $(OUT)/source/%.o : source/%.c
+ $(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
+
++$(OUT)/source/%.lo : source/%.c
++ $(LTCC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
++
+ $(OUT)/platform/%.o : platform/%.c
+ $(CC_CMD) -Wall
+
+@@ -107,12 +120,13 @@
+ $(WINDRES_CMD)
+
+ .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
++.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
+ .PRECIOUS : $(OUT)/%.exe # Keep intermediates from chained rules
+
+ # --- File lists ---
+
+-THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.o)
+-THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.o)
++THIRD_LOBJ := $(THIRD_SRC:%.c=$(OUT)/%.lo)
++THIRD_LOBJ := $(THIRD_LOBJ:%.cc=$(OUT)/%.lo)
+
+ MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
+ MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
+@@ -121,7 +135,7 @@
+ MUPDF_SRC += $(sort $(wildcard source/html/*.c))
+ MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
+
+-MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
++MUPDF_LOBJ := $(MUPDF_SRC:%.c=$(OUT)/%.lo)
+
+ THREAD_SRC := source/helpers/mu-threads/mu-threads.c
+ THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
+@@ -149,13 +163,13 @@
+ generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
+
+ ifeq ($(HAVE_OBJCOPY),yes)
+- MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
++ MUPDF_LOBJ += $(FONT_BIN:%=$(OUT)/%.o)
+ $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD)
+ $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD)
+ $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
+ $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)