diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 45 |
1 files changed, 20 insertions, 25 deletions
@@ -18,16 +18,10 @@ include Makethird CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) LIBS += $(XLIBS) -lm -THIRD_LIBS += $(FREETYPE_LIB) -THIRD_LIBS += $(JBIG2DEC_LIB) -THIRD_LIBS += $(JPEG_LIB) -THIRD_LIBS += $(OPENJPEG_LIB) -THIRD_LIBS += $(OPENSSL_LIB) -THIRD_LIBS += $(ZLIB_LIB) - LIBS += $(FREETYPE_LIBS) LIBS += $(JBIG2DEC_LIBS) LIBS += $(JPEG_LIBS) +LIBS += $(MUJS_LIBS) LIBS += $(OPENJPEG_LIBS) LIBS += $(OPENSSL_LIBS) LIBS += $(ZLIB_LIBS) @@ -35,6 +29,7 @@ LIBS += $(ZLIB_LIBS) CFLAGS += $(FREETYPE_CFLAGS) CFLAGS += $(JBIG2DEC_CFLAGS) CFLAGS += $(JPEG_CFLAGS) +CFLAGS += $(MUJS_CFLAGS) CFLAGS += $(OPENJPEG_CFLAGS) CFLAGS += $(OPENSSL_CFLAGS) CFLAGS += $(ZLIB_CFLAGS) @@ -98,13 +93,8 @@ CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC)))) -# --- Choice of Javascript library --- - ifeq "$(HAVE_MUJS)" "yes" PDF_OBJ += $(OUT)/pdf/js/pdf-js.o -THIRD_LIBS += $(MUJS_LIB) -LIBS += $(MUJS_LIBS) -CFLAGS += $(MUJS_CFLAGS) else PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o endif @@ -118,11 +108,16 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $(GPRF_SRC_HDR) # --- Library --- -MUPDF_LIB := $(OUT)/libmupdf.a +MUPDF_LIB = $(OUT)/libmupdf.a +THIRD_LIB = $(OUT)/libmupdfthird.a + +MUPDF_OBJ := $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) +THIRD_OBJ := $(FREETYPE_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) -$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) +$(THIRD_LIB) : $(THIRD_OBJ) -INSTALL_LIBS := $(MUPDF_LIB) +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) # --- Rules --- @@ -234,19 +229,19 @@ $(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pd MUTOOL := $(addprefix $(OUT)/, mutool) MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o) $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) -$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB) $(MUTOOL) : $(MUTOOL_OBJ) $(LINK_CMD) MJSGEN := $(OUT)/mjsgen -$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MJSGEN) : $(MUPDF_LIB) $(THIRD_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_LIBS) +$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB) $(MUJSTEST) : $(MUJSTEST_OBJ) $(LINK_CMD) @@ -254,7 +249,7 @@ 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_LIBS) +$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB) $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) $(LINK_CMD) $(X11_LIBS) @@ -262,7 +257,7 @@ 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_LIBS) $(GLFW_LIB) +$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB) $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) $(LINK_CMD) $(GLFW_LIBS) endif @@ -271,7 +266,7 @@ 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_LIBS) $(CURL_LIB) +$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) endif @@ -281,7 +276,7 @@ ifeq "$(HAVE_WIN32)" "yes" 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_LIBS) +$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB) $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(LINK_CMD) $(WIN32_LIBS) endif @@ -295,9 +290,9 @@ INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) examples: $(OUT)/example $(OUT)/multi-threaded -$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIBS) +$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB) $(LINK_CMD) $(CFLAGS) -$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIBS) +$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB) $(LINK_CMD) $(CFLAGS) -lpthread # --- Update version string header --- @@ -326,7 +321,7 @@ incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man docdir ?= $(prefix)/share/doc/mupdf -third: $(THIRD_LIBS) +third: $(THIRD_LIB) extra: $(CURL_LIB) $(GLFW_LIB) libs: $(INSTALL_LIBS) apps: $(INSTALL_APPS) |