--- mupdf-1.9a/Makefile +++ mupdf-1.9a/Makefile @@ -142,15 +141,12 @@ # --- Library --- MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdfthird.a MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) -THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) $(MUPDF_LIB) : $(MUPDF_OBJ) -$(THIRD_LIB) : $(THIRD_OBJ) -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) +INSTALL_LIBS := $(MUPDF_LIB) # --- Rules --- @@ -251,19 +247,19 @@ 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) MJSGEN := $(OUT)/mjsgen -$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB) +$(MJSGEN) : $(MUPDF_LIB) $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) $(LINK_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) @@ -271,7 +267,7 @@ 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) @@ -279,7 +275,7 @@ 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) endif @@ -288,7 +284,7 @@ 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) endif @@ -298,7 +294,7 @@ 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) endif @@ -312,9 +308,9 @@ examples: $(OUT)/example $(OUT)/multi-threaded -$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB) +$(OUT)/example: docs/example.c $(MUPDF_LIB) $(LINK_CMD) $(CFLAGS) -$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB) +$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(LINK_CMD) $(CFLAGS) -lpthread # --- Update version string header --- @@ -343,7 +339,6 @@ mandir ?= $(prefix)/share/man docdir ?= $(prefix)/share/doc/mupdf -third: $(THIRD_LIB) extra: $(CURL_LIB) $(GLFW_LIB) libs: $(INSTALL_LIBS) apps: $(INSTALL_APPS) @@ -376,7 +371,7 @@ java: $(MAKE) -C platform/java -tags: $(shell find include source platform thirdparty -name '*.[ch]' -or -name '*.cc' -or -name '*.hh') +tags: $(shell find include source platform -name '*.[ch]' -or -name '*.cc' -or -name '*.hh') ctags $^ cscope.files: $(shell find include source platform -name '*.[ch]') @@ -397,4 +392,4 @@ debug: $(MAKE) build=debug -.PHONY: all clean nuke install third libs apps generate +.PHONY: all clean nuke install libs apps generate