-+$(OUT)/%.lo : source/%.c | $(ALL_DIR)
-+ $(LTCC_CMD)
-+
-+$(OUT)/%.lo : source/%.cpp | $(ALL_DIR)
-+ $(LTCXX_CMD)
-+
- $(OUT)/%.o : scripts/%.c | $(OUT)
- $(CC_CMD)
-
-@@ -240,57 +248,57 @@
-
- generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
-
--$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
--$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
--$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN)
--$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
--$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
-+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
-+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
-+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
-+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
-+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
-
- # --- Tools and Apps ---
-
- MUTOOL := $(addprefix $(OUT)/, mutool)
- MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o)
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
--$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUTOOL) : $(MUPDF_LIB)
- $(MUTOOL) : $(MUTOOL_OBJ)
-- $(LINK_CMD)
-+ $(LTLINK_CMD)
-
- MJSGEN := $(OUT)/mjsgen
--$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MJSGEN) : $(MUPDF_LIB)
- $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
-- $(LINK_CMD)
-+ $(LTLINK_CMD)
-
- MUJSTEST := $(OUT)/mujstest
- MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
- $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUJSTEST) : $(MUPDF_LIB)
- $(MUJSTEST) : $(MUJSTEST_OBJ)
-- $(LINK_CMD)
-+ $(LTLINK_CMD)
-
- ifeq "$(HAVE_X11)" "yes"
- MUVIEW_X11 := $(OUT)/mupdf-x11
- MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
- $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_X11) : $(MUPDF_LIB)
- $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
-- $(LINK_CMD) $(X11_LIBS)
-+ $(LTLINK_CMD) $(X11_LIBS)
-
- ifeq "$(HAVE_GLFW)" "yes"
- MUVIEW_GLFW := $(OUT)/mupdf-gl
- MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
- $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
--$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
-+$(MUVIEW_GLFW) : $(MUPDF_LIB) $(GLFW_LIB)
- $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
-- $(LINK_CMD) $(GLFW_LIBS)
-+ $(LTLINK_CMD) $(GLFW_LIBS)
- endif
-
- ifeq "$(HAVE_CURL)" "yes"
- MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
- MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
- $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
-+$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(CURL_LIB)
- $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
-- $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
-+ $(LTLINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
- endif
- endif
-
-@@ -298,9 +306,9 @@
- MUVIEW_WIN32 := $(OUT)/mupdf
- MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
- $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
--$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_WIN32) : $(MUPDF_LIB)
- $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
-- $(LINK_CMD) $(WIN32_LIBS)
-+ $(LTLINK_CMD) $(WIN32_LIBS)
- endif
-
- MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
-@@ -312,10 +320,10 @@
-
- examples: $(OUT)/example $(OUT)/multi-threaded
-
--$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB)
-- $(LINK_CMD) $(CFLAGS)
--$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB)
-- $(LINK_CMD) $(CFLAGS) -lpthread
-+$(OUT)/example: docs/example.c $(MUPDF_LIB)
-+ $(LTLINK_CMD) $(CFLAGS)
-+$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB)
-+ $(LTLINK_CMD) $(CFLAGS) -lpthread