diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-08-15 13:32:16 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-08-15 13:32:16 +0200 |
| commit | df424210e662c660dafa50be00148a117ef8d95c (patch) | |
| tree | 224c187b6337ae4083f18f9aa91ecd39fe79def0 /Makefile | |
| parent | 00fbe2446c7ca2c291b785da99f6e0b293574001 (diff) | |
| parent | 8530783a10e467947f8698cf44d38313b5454cb2 (diff) | |
| download | mupdf-df424210e662c660dafa50be00148a117ef8d95c.tar.xz | |
Merge branch 'release' into 'master'.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -239,11 +239,13 @@ $(MUVIEW_X11) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) $(MUVIEW_X11) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) -MUVIEW_X11_CURL := $(OUT)/mupdf-curl +ifeq "$(NOCURL)" "" +MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) endif +endif ifeq "$(V8_PRESENT)" "yes" ifeq "$(NOX11)" "" @@ -258,7 +260,7 @@ MUVIEW := $(MUVIEW_X11) MUVIEW_V8 := $(MUVIEW_X11_V8) MUVIEW_CURL := $(MUVIEW_X11_CURL) -INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8) $(MUVIEW_X11_CURL) +INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8) $(MUVIEW_CURL) # --- Format man pages --- |