Wed Nov 11 17:08:25 2015 UTC ()
Update print/mupdf to 1.8.

pkgsrc changes:
 * Bump BUILDLINK_API_DEPENDS (spotted and tested via the only print/mupdf
   consumer wip/zathura-mupdf)
 * OpenGL-based desktop viewer is still not enabled by default neither upstream
   nor in pkgsrc

Changes:
List of changes in MuPDF 1.8
* Headline changes:
	* New OpenGL-based barebones desktop viewer.
	* New URW fonts with greek and cyrillic.
	* 64-bit file support.
	* Ghostscript proofing mode (source only; not in shipped binaries).
* EPUB improvements:
	* User style sheets.
	* GIF images (also for CBZ).
	* Table of contents.
	* CJK text.
	* Page margins.
	* Many bug fixes.
* Bug fixes:
	* Updated FreeType to version 2.6.1.
	* Various font substitution bug fixes.
	* Fix setjmp/longjmp behaviour which could cause optimizing compilers to misbehave.


(leot)
diff -r1.31 -r1.32 pkgsrc/print/mupdf/Makefile
diff -r1.9 -r1.10 pkgsrc/print/mupdf/PLIST
diff -r1.7 -r1.8 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.20 -r1.21 pkgsrc/print/mupdf/distinfo
diff -r1.7 -r1.8 pkgsrc/print/mupdf/files/mupdf.pc
diff -r1.9 -r1.10 pkgsrc/print/mupdf/patches/patch-ab
diff -r1.10 -r1.11 pkgsrc/print/mupdf/patches/patch-ac
cvs diff -r1.31 -r1.32 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2015/09/06 20:53:24 1.31
+++ pkgsrc/print/mupdf/Makefile 2015/11/11 17:08:25 1.32
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.31 2015/09/06 20:53:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2015/11/11 17:08:25 leot Exp $
2 2
3DISTNAME= mupdf-1.7a-source 3DISTNAME= mupdf-1.8-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= http://mupdf.com/downloads/ 6MASTER_SITES= http://mupdf.com/downloads/
7 7
8MAINTAINER= leot1990@users.sourceforge.net 8MAINTAINER= leot@NetBSD.org
9HOMEPAGE= http://mupdf.com/ 9HOMEPAGE= http://mupdf.com/
10COMMENT= Lightweight PDF viewer and toolkit 10COMMENT= Lightweight PDF viewer and toolkit
11LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
12 12
13USE_LANGUAGES+= c99 13USE_LANGUAGES= c99
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
16 16
17INSTALLATION_DIRS+= bin include lib/pkgconfig 17INSTALLATION_DIRS+= bin include lib/pkgconfig
18INSTALL_MAKE_FLAGS+= prefix=${PREFIX} 18INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
19INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 19INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
20LDFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib 20LDFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
21MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 21MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
22MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q} 22MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q}
23MAKE_FLAGS+= build=release 23MAKE_FLAGS+= build=release
24 24
25CFLAGS+= -DJBIG_NO_MEMENTO 25CFLAGS+= -DJBIG_NO_MEMENTO
26CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 26CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
27 27
28.include "options.mk" 28.include "options.mk"
29 29
30# Remove thirdparty directory in order to use the libraries provided by pkgsrc 30# Remove thirdparty directory in order to use the libraries provided by pkgsrc
31# mujs directory is an exception and should not be removed (MuJS is the 31# mujs directory is an exception and should not be removed (MuJS is the
32# default Javascript interpreter for mupdf). 32# default Javascript interpreter for mupdf).
33post-extract: 33post-extract:
34 ${RM} -fr \ 34 ${RM} -fr \
35 ${WRKSRC}/thirdparty/curl \ 35 ${WRKSRC}/thirdparty/curl \
36 ${WRKSRC}/thirdparty/freetype \ 36 ${WRKSRC}/thirdparty/freetype \
cvs diff -r1.9 -r1.10 pkgsrc/print/mupdf/PLIST (expand / switch to unified diff)

--- pkgsrc/print/mupdf/PLIST 2015/04/17 07:18:21 1.9
+++ pkgsrc/print/mupdf/PLIST 2015/11/11 17:08:25 1.10
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2015/04/17 07:18:21 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.10 2015/11/11 17:08:25 leot Exp $
2bin/mudraw 
3bin/mujstest 2bin/mujstest
4bin/mupdf 3bin/mupdf
5bin/mutool 4bin/mutool
6include/mupdf/fitz.h 5include/mupdf/fitz.h
7include/mupdf/fitz/annotation.h 6include/mupdf/fitz/annotation.h
8include/mupdf/fitz/bitmap.h 7include/mupdf/fitz/bitmap.h
9include/mupdf/fitz/buffer.h 8include/mupdf/fitz/buffer.h
10include/mupdf/fitz/colorspace.h 9include/mupdf/fitz/colorspace.h
11include/mupdf/fitz/compressed-buffer.h 10include/mupdf/fitz/compressed-buffer.h
12include/mupdf/fitz/context.h 11include/mupdf/fitz/context.h
13include/mupdf/fitz/crypt.h 12include/mupdf/fitz/crypt.h
14include/mupdf/fitz/device.h 13include/mupdf/fitz/device.h
15include/mupdf/fitz/display-list.h 14include/mupdf/fitz/display-list.h
@@ -24,36 +23,39 @@ include/mupdf/fitz/hash.h @@ -24,36 +23,39 @@ include/mupdf/fitz/hash.h
24include/mupdf/fitz/image.h 23include/mupdf/fitz/image.h
25include/mupdf/fitz/link.h 24include/mupdf/fitz/link.h
26include/mupdf/fitz/math.h 25include/mupdf/fitz/math.h
27include/mupdf/fitz/outline.h 26include/mupdf/fitz/outline.h
28include/mupdf/fitz/output-pcl.h 27include/mupdf/fitz/output-pcl.h
29include/mupdf/fitz/output-png.h 28include/mupdf/fitz/output-png.h
30include/mupdf/fitz/output-pnm.h 29include/mupdf/fitz/output-pnm.h
31include/mupdf/fitz/output-pwg.h 30include/mupdf/fitz/output-pwg.h
32include/mupdf/fitz/output-svg.h 31include/mupdf/fitz/output-svg.h
33include/mupdf/fitz/output-tga.h 32include/mupdf/fitz/output-tga.h
34include/mupdf/fitz/output.h 33include/mupdf/fitz/output.h
35include/mupdf/fitz/path.h 34include/mupdf/fitz/path.h
36include/mupdf/fitz/pixmap.h 35include/mupdf/fitz/pixmap.h
 36include/mupdf/fitz/separation.h
37include/mupdf/fitz/shade.h 37include/mupdf/fitz/shade.h
38include/mupdf/fitz/store.h 38include/mupdf/fitz/store.h
39include/mupdf/fitz/stream.h 39include/mupdf/fitz/stream.h
40include/mupdf/fitz/string.h 40include/mupdf/fitz/string.h
41include/mupdf/fitz/structured-text.h 41include/mupdf/fitz/structured-text.h
42include/mupdf/fitz/system.h 42include/mupdf/fitz/system.h
43include/mupdf/fitz/text.h 43include/mupdf/fitz/text.h
44include/mupdf/fitz/transition.h 44include/mupdf/fitz/transition.h
45include/mupdf/fitz/tree.h 45include/mupdf/fitz/tree.h
 46include/mupdf/fitz/ucdn.h
46include/mupdf/fitz/unzip.h 47include/mupdf/fitz/unzip.h
 48include/mupdf/fitz/util.h
47include/mupdf/fitz/version.h 49include/mupdf/fitz/version.h
48include/mupdf/fitz/write-document.h 50include/mupdf/fitz/write-document.h
49include/mupdf/fitz/xml.h 51include/mupdf/fitz/xml.h
50include/mupdf/html.h 52include/mupdf/html.h
51include/mupdf/memento.h 53include/mupdf/memento.h
52include/mupdf/pdf-tools.h 54include/mupdf/pdf-tools.h
53include/mupdf/pdf.h 55include/mupdf/pdf.h
54include/mupdf/pdf/annot.h 56include/mupdf/pdf/annot.h
55include/mupdf/pdf/appearance.h 57include/mupdf/pdf/appearance.h
56include/mupdf/pdf/clean.h 58include/mupdf/pdf/clean.h
57include/mupdf/pdf/cmap.h 59include/mupdf/pdf/cmap.h
58include/mupdf/pdf/crypt.h 60include/mupdf/pdf/crypt.h
59include/mupdf/pdf/document.h 61include/mupdf/pdf/document.h
@@ -64,24 +66,23 @@ include/mupdf/pdf/interpret.h @@ -64,24 +66,23 @@ include/mupdf/pdf/interpret.h
64include/mupdf/pdf/javascript.h 66include/mupdf/pdf/javascript.h
65include/mupdf/pdf/name-table.h 67include/mupdf/pdf/name-table.h
66include/mupdf/pdf/object.h 68include/mupdf/pdf/object.h
67include/mupdf/pdf/output-pdf.h 69include/mupdf/pdf/output-pdf.h
68include/mupdf/pdf/page.h 70include/mupdf/pdf/page.h
69include/mupdf/pdf/parse.h 71include/mupdf/pdf/parse.h
70include/mupdf/pdf/resource.h 72include/mupdf/pdf/resource.h
71include/mupdf/pdf/widget.h 73include/mupdf/pdf/widget.h
72include/mupdf/pdf/xref.h 74include/mupdf/pdf/xref.h
73include/mupdf/xps.h 75include/mupdf/xps.h
74lib/libmujs.la 76lib/libmujs.la
75lib/libmupdf.la 77lib/libmupdf.la
76lib/pkgconfig/mupdf.pc 78lib/pkgconfig/mupdf.pc
77man/man1/mudraw.1 
78man/man1/mupdf.1 79man/man1/mupdf.1
79man/man1/mutool.1 80man/man1/mutool.1
80share/doc/mupdf/CHANGES 81share/doc/mupdf/CHANGES
81share/doc/mupdf/COPYING 82share/doc/mupdf/COPYING
82share/doc/mupdf/README 83share/doc/mupdf/README
83share/doc/mupdf/naming.txt 84share/doc/mupdf/naming.txt
84share/doc/mupdf/overview.txt 85share/doc/mupdf/overview.txt
85share/doc/mupdf/progressive.txt 86share/doc/mupdf/progressive.txt
86share/doc/mupdf/refcount.txt 87share/doc/mupdf/refcount.txt
87share/doc/mupdf/thirdparty.txt 88share/doc/mupdf/thirdparty.txt
cvs diff -r1.7 -r1.8 pkgsrc/print/mupdf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/buildlink3.mk 2015/04/17 07:18:21 1.7
+++ pkgsrc/print/mupdf/buildlink3.mk 2015/11/11 17:08:25 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.7 2015/04/17 07:18:21 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2015/11/11 17:08:25 leot Exp $
2 2
3BUILDLINK_TREE+= mupdf 3BUILDLINK_TREE+= mupdf
4 4
5.if !defined(MUPDF_BUILDLINK3_MK) 5.if !defined(MUPDF_BUILDLINK3_MK)
6MUPDF_BUILDLINK3_MK:= 6MUPDF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.7 8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.8
9BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf 9BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
10 10
11pkgbase := mupdf 11pkgbase := mupdf
12.include "../../mk/pkg-build-options.mk" 12.include "../../mk/pkg-build-options.mk"
13 13
14.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl) 14.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
15.include "../../www/curl/buildlink3.mk" 15.include "../../www/curl/buildlink3.mk"
16.include "../../mk/pthread.buildlink3.mk" 16.include "../../mk/pthread.buildlink3.mk"
17.endif 17.endif
18 18
19.include "../../graphics/jbig2dec/buildlink3.mk" 19.include "../../graphics/jbig2dec/buildlink3.mk"
20.include "../../graphics/openjpeg/buildlink3.mk" 20.include "../../graphics/openjpeg/buildlink3.mk"
21.include "../../mk/jpeg.buildlink3.mk" 21.include "../../mk/jpeg.buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2015/11/04 01:01:36 1.20
+++ pkgsrc/print/mupdf/distinfo 2015/11/11 17:08:25 1.21
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.20 2015/11/04 01:01:36 agc Exp $ 1$NetBSD: distinfo,v 1.21 2015/11/11 17:08:25 leot Exp $
2 2
3SHA1 (mupdf-1.7a-source.tar.gz) = 6114cb8d318c71f877cea4660df2eb513fcf82b9 3SHA1 (mupdf-1.8-source.tar.gz) = 9fbc9e06f0b74fe904745c363324eaca3517bfce
4RMD160 (mupdf-1.7a-source.tar.gz) = cc9260029a7665004584ff6aa1b49e259b08be37 4RMD160 (mupdf-1.8-source.tar.gz) = 2708f5650f23101a66cef92b7903aafb716f9c02
5SHA512 (mupdf-1.7a-source.tar.gz) = 5b8dc8146ef0aa652cc889b6470fc157287bb351cb0990216d5e891bdc4c1b287e0299b4291161938369df4b2591cb36a53ea415b7bd13b0c1415cb51b196ca7 5SHA512 (mupdf-1.8-source.tar.gz) = 938fbed4afc0dd0aa621911cd70b9289c6a4f13d026f9390b11fc86d5b37845a76943c9fa42f218f67fe298295f15d6664a18be7bf73b5d952724122510f9deb
6Size (mupdf-1.7a-source.tar.gz) = 13310720 bytes 6Size (mupdf-1.8-source.tar.gz) = 14169777 bytes
7SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299 7SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
8SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3 8SHA1 (patch-ab) = 8f8f167d9207734891c68e358c802107f5600da2
9SHA1 (patch-ac) = 2db78731ebbac03a2cfe3329e20544db013b3b10 9SHA1 (patch-ac) = 81bad722bc5d30e6aeb367b30d9d1c4bad816429
10SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19 10SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
11SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33 11SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
cvs diff -r1.7 -r1.8 pkgsrc/print/mupdf/files/mupdf.pc (expand / switch to unified diff)

--- pkgsrc/print/mupdf/files/mupdf.pc 2015/04/17 07:18:21 1.7
+++ pkgsrc/print/mupdf/files/mupdf.pc 2015/11/11 17:08:25 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1prefix=@PREFIX@ 1prefix=@PREFIX@
2exec_prefix=${prefix} 2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib 3libdir=${exec_prefix}/lib
4includedir=${prefix}/include 4includedir=${prefix}/include
5 5
6Name: mupdf 6Name: mupdf
7Description: library for PDF files 7Description: library for PDF files
8Version: 1.7 8Version: 1.8
9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf 9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
10Cflags: -I${includedir} 10Cflags: -I${includedir}
cvs diff -r1.9 -r1.10 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2014/06/15 19:15:51 1.9
+++ pkgsrc/print/mupdf/patches/patch-ab 2015/11/11 17:08:25 1.10
@@ -1,54 +1,63 @@ @@ -1,54 +1,63 @@
1$NetBSD: patch-ab,v 1.9 2014/06/15 19:15:51 wiz Exp $ 1$NetBSD: patch-ab,v 1.10 2015/11/11 17:08:25 leot Exp $
2 2
3o Handle the various operating systems in the same way avoiding hardcoding 3o Handle the various operating systems in the same way avoiding hardcoding
4o Build and link with openjpeg-2.1 4o Build and link with openjpeg-2.1
5 5
6--- Makerules.orig 2014-06-10 15:09:28.000000000 +0000 6--- Makerules.orig 2015-10-21 14:45:11.000000000 +0000
7+++ Makerules 7+++ Makerules
8@@ -25,37 +25,6 @@ else 8@@ -29,46 +29,6 @@ ifeq "$(largefile)" "yes"
9 $(error unknown build setting: '$(build)') 9 CFLAGS += -DFZ_LARGEFILE
10 endif 10 endif
11  11
12-# Windows (MINGW) build doesn't use system libraries. 12-# Windows (MINGW) build doesn't use system libraries.
13-ifeq "$(OS)" "MINGW" 13-ifeq "$(OS)" "MINGW"
14- 14-
 15-HAVE_X11 ?= no
 16-HAVE_GLUT ?= yes
 17-
 18-SYS_GLUT_CFLAGS = -DFREEGLUT_STATIC -Ithirdparty/freeglut/include
 19-SYS_GLUT_LIBS = -Lthirdparty/freeglut/lib -lfreeglut_static -lopengl32 -lgdi32 -lwinmm
 20-
15-# Mac OS X doesn't have pkg-config so we hard code paths. 21-# Mac OS X doesn't have pkg-config so we hard code paths.
16-else ifeq "$(OS)" "MACOS" 22-else ifeq "$(OS)" "MACOS"
17- 23-
18-HAVE_X11 ?= yes 24-HAVE_X11 ?= yes
 25-HAVE_GLUT ?= yes
19- 26-
20-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL 27-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
21-SYS_OPENSSL_LIBS = -lcrypto 28-SYS_OPENSSL_LIBS = -lcrypto
22- 29-
23-SYS_CURL_DEPS = -lpthread 30-SYS_CURL_DEPS = -lpthread
24- 31-
25-SYS_X11_CFLAGS = -I/usr/X11R6/include 32-SYS_X11_CFLAGS = -I/usr/X11R6/include
26-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext 33-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
 34-SYS_GLUT_CFLAGS = -Wno-deprecated-declarations
 35-SYS_GLUT_LIBS = -framework GLUT -framework OpenGL
27- 36-
28-SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2 37-SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2
29-SYS_FREETYPE_LIBS = -lfreetype 38-SYS_FREETYPE_LIBS = -lfreetype
30-SYS_OPENJPEG_LIBS = -lopenjpeg 39-SYS_OPENJPEG_LIBS = -lopenjpeg
31-SYS_JBIG2DEC_LIBS = -ljbig2dec 40-SYS_JBIG2DEC_LIBS = -ljbig2dec
32-SYS_JPEG_LIBS = -ljpeg 41-SYS_JPEG_LIBS = -ljpeg
33-SYS_ZLIB_LIBS = -lz 42-SYS_ZLIB_LIBS = -lz
34- 43-
35-CC = xcrun cc 44-CC = xcrun cc
36-AR = xcrun ar 45-AR = xcrun ar
37-LD = xcrun ld 46-LD = xcrun ld
38-RANLIB_CMD = xcrun ranlib $@ 47-RANLIB_CMD = xcrun ranlib $@
39- 48-
40-# Linux uses pkg-config for system libraries. 49-# Linux uses pkg-config for system libraries.
41-else ifeq "$(OS)" "Linux" 50-else ifeq "$(OS)" "Linux"
42- 51-
43 HAVE_X11 ?= yes 52 HAVE_X11 ?= yes
 53 HAVE_GLUT ?= yes
44  54
45 ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes" 55@@ -98,8 +58,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
46@@ -81,8 +50,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec 
47 SYS_JPEG_LIBS = -ljpeg 56 SYS_JPEG_LIBS = -ljpeg
48 SYS_ZLIB_LIBS = -lz 57 SYS_ZLIB_LIBS = -lz
49  58
50-endif 59-endif
51- 60-
52 # The following section is an example of how to simply do cross-compilation 61 # The following section is an example of how to simply do cross-compilation
53 # using these Makefiles. It builds for a beagleboard running ARM linux, 62 # using these Makefiles. It builds for a beagleboard running ARM linux,
54 # compiling on windows with the CodeSourcery G++ compilers. 63 # compiling on windows with the CodeSourcery G++ compilers.
cvs diff -r1.10 -r1.11 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2015/04/17 07:18:21 1.10
+++ pkgsrc/print/mupdf/patches/patch-ac 2015/11/11 17:08:25 1.11
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ac,v 1.10 2015/04/17 07:18:21 wiz Exp $ 1$NetBSD: patch-ac,v 1.11 2015/11/11 17:08:25 leot Exp $
2 2
3o libtool support  3o libtool support
4o Install target cleanup 4o Install target cleanup
5o Install only one "mupdf" binary, prefer the featureful one and always 5o Install only one "mupdf" binary, prefer the featureful one and always
6 install it as "mupdf" 6 install it as "mupdf"
7o libmujs support: install like a non-thirdparty mupdf's library 7o libmujs support: install like a non-thirdparty mupdf's library
8 8
9--- Makefile.orig 2015-04-08 15:04:10.000000000 +0000 9--- Makefile.orig 2015-10-21 14:45:11.000000000 +0000
10+++ Makefile 10+++ Makefile
11@@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS) 11@@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS)
12  12
13 # --- Commands --- 13 # --- Commands ---
14  14
15-ifneq "$(verbose)" "yes" 15-ifneq "$(verbose)" "yes"
16-QUIET_AR = @ echo ' ' ' ' AR $@ ; 16-QUIET_AR = @ echo ' ' ' ' AR $@ ;
17-QUIET_CC = @ echo ' ' ' ' CC $@ ; 17-QUIET_CC = @ echo ' ' ' ' CC $@ ;
18-QUIET_CXX = @ echo ' ' ' ' CXX $@ ; 18-QUIET_CXX = @ echo ' ' ' ' CXX $@ ;
19-QUIET_GEN = @ echo ' ' ' ' GEN $@ ; 19-QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
20-QUIET_LINK = @ echo ' ' ' ' LINK $@ ; 20-QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
21-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ; 21-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
22-QUIET_RM = @ echo ' ' ' ' RM $@ ; 22-QUIET_RM = @ echo ' ' ' ' RM $@ ;
@@ -27,40 +27,42 @@ o libmujs support: install like a non-th @@ -27,40 +27,42 @@ o libmujs support: install like a non-th
27-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ 27-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
28-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) 28-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
29-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ 29-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
30-RM_CMD = $(QUIET_RM) rm -f $@ 30-RM_CMD = $(QUIET_RM) rm -f $@
31+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $< 31+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
32+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $< 32+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $<
33+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ 33+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
34+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) 34+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
35+MKDIR_CMD = mkdir -p $@ 35+MKDIR_CMD = mkdir -p $@
36+RM_CMD = rm -f $@ 36+RM_CMD = rm -f $@
37  37
38 # --- File lists --- 38 # --- File lists ---
39  39
40@@ -87,32 +77,32 @@ PDF_SRC_HDR := $(wildcard source/pdf/*.h 40@@ -91,33 +81,33 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h
41 XPS_SRC_HDR := $(wildcard source/xps/*.h) 
42 HTML_SRC_HDR := $(wildcard source/html/*.h) 41 HTML_SRC_HDR := $(wildcard source/html/*.h)
 42 GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
43  43
44-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) 44-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
45-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) 45-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
46-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) 46-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
47-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) 47-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
48-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) 48-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
 49-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC))))
49+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC)))) 50+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
50+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC)))) 51+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
51+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC)))) 52+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
52+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC)))) 53+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
53+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC)))) 54+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
 55+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC))))
54  56
55 # --- Choice of Javascript library --- 57 # --- Choice of Javascript library ---
56  58
57 ifeq "$(HAVE_MUJS)" "yes" 59 ifeq "$(HAVE_MUJS)" "yes"
58-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 60-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
59-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o 61-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
60+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 62+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo
61+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo 63+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo
62 THIRD_LIBS += $(MUJS_LIB) 64 THIRD_LIBS += $(MUJS_LIB)
63 LIBS += $(MUJS_LIBS) 65 LIBS += $(MUJS_LIBS)
64 CFLAGS += $(MUJS_CFLAGS) 66 CFLAGS += $(MUJS_CFLAGS)
65 else ifeq "$(HAVE_JSCORE)" "yes" 67 else ifeq "$(HAVE_JSCORE)" "yes"
66-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 68-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
@@ -72,34 +74,34 @@ o libmujs support: install like a non-th @@ -72,34 +74,34 @@ o libmujs support: install like a non-th
72 else ifeq "$(HAVE_V8)" "yes" 74 else ifeq "$(HAVE_V8)" "yes"
73-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 75-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
74-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o 76-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o
75+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 77+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo
76+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo 78+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo
77 LIBS += $(V8_LIBS) 79 LIBS += $(V8_LIBS)
78 CFLAGS += $(V8_CFLAGS) 80 CFLAGS += $(V8_CFLAGS)
79 else 81 else
80-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o 82-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o
81+PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.lo 83+PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.lo
82 endif 84 endif
83  85
84 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) 86 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
85@@ -123,44 +113,47 @@ $(HTML_OBJ) : $(FITZ_HDR) $(HTML_HDR) $( 87@@ -129,47 +119,50 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $(
86  88
87 # --- Library --- 89 # --- Library ---
88  90
89-MUPDF_LIB := $(OUT)/libmupdf.a 91-MUPDF_LIB := $(OUT)/libmupdf.a
90+MUPDF_LIB := $(OUT)/libmupdf.la 92+MUPDF_LIB := $(OUT)/libmupdf.la
91  93
92 $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) 94 $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
93  95
94 INSTALL_LIBS := $(MUPDF_LIB) 96 INSTALL_LIBS := $(MUPDF_LIB)
95+ifeq "$(HAVE_MUJS)" "yes" 97+ifeq "$(HAVE_MUJS)" "yes"
96+INSTALL_LIBS += $(MUJS_LIB) 98+INSTALL_LIBS += $(MUJS_LIB)
97+endif 99+endif
98  100
99 # --- Rules --- 101 # --- Rules ---
100  102
101 $(ALL_DIR) $(OUT) $(GEN) : 103 $(ALL_DIR) $(OUT) $(GEN) :
102 $(MKDIR_CMD) 104 $(MKDIR_CMD)
103  105
104-$(OUT)/%.a : 106-$(OUT)/%.a :
105+$(OUT)/%.la : 107+$(OUT)/%.la :
@@ -125,122 +127,127 @@ o libmujs support: install like a non-th @@ -125,122 +127,127 @@ o libmujs support: install like a non-th
125  127
126-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) 128-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
127+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR) 129+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR)
128 $(CC_CMD) $(X11_CFLAGS) 130 $(CC_CMD) $(X11_CFLAGS)
129  131
130-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT) 132-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
131+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT) 133+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT)
132 windres $< $@ 134 windres $< $@
133  135
134-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR) 136-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
135+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR) 137+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
136 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL 138 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
137  139
 140-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
 141+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR)
 142 $(CC_CMD) $(GLFW_CFLAGS)
 143
138-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules 144-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
139+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules 145+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
140  146
141 # --- Generated CMAP, FONT and JAVASCRIPT files --- 147 # --- Generated CMAP, FONT and JAVASCRIPT files ---
142  148
143@@ -224,24 +217,24 @@ endif 149@@ -233,17 +226,17 @@ endif
144  150
145 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN) 151 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
146  152
147-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) 153-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
148-$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN) 154-$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN)
149-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) 155-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
150-$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) 156-$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN)
151-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h 157-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
152-$(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 158-$(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
153+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN) 159+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
154+$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN) 160+$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN)
155+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN) 161+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
156+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN) 162+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
157+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h 163+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
158+$(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 164+$(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
159  165
160 # --- Tools and Apps --- 166 # --- Tools and Apps ---
161  167
162 MUDRAW := $(addprefix $(OUT)/, mudraw) 
163-MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.o) 
164+MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.lo) 
165 $(MUDRAW_OBJ) : $(FITZ_HDR) $(PDF_HDR) 
166 $(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS) 
167 $(MUDRAW) : $(MUDRAW_OBJ) 
168 $(LINK_CMD) 
169  
170 MUTOOL := $(addprefix $(OUT)/, mutool) 168 MUTOOL := $(addprefix $(OUT)/, mutool)
171-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o) 169-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o)
172+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo) 170+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo mudraw.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo)
173 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) 171 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
174 $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) 172 $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
175 $(MUTOOL) : $(MUTOOL_OBJ) 173 $(MUTOOL) : $(MUTOOL_OBJ)
176@@ -249,27 +242,27 @@ $(MUTOOL) : $(MUTOOL_OBJ) 174@@ -251,11 +244,11 @@ $(MUTOOL) : $(MUTOOL_OBJ)
177  175
178 MJSGEN := $(OUT)/mjsgen 176 MJSGEN := $(OUT)/mjsgen
179 $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) 177 $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
180-$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) 178-$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
181+$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.lo) 179+$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.lo)
182 $(LINK_CMD) 180 $(LINK_CMD)
183  181
184 MUJSTEST := $(OUT)/mujstest 182 MUJSTEST := $(OUT)/mujstest
185-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) 183-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
186+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo) 184+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
187 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) 185 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
188 $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS) 186 $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS)
189 $(MUJSTEST) : $(MUJSTEST_OBJ) 187 $(MUJSTEST) : $(MUJSTEST_OBJ)
190 $(LINK_CMD) 188@@ -263,7 +256,7 @@ $(MUJSTEST) : $(MUJSTEST_OBJ)
191  189
192 ifeq "$(HAVE_X11)" "yes" 190 ifeq "$(HAVE_X11)" "yes"
193-MUVIEW_X11 := $(OUT)/mupdf-x11 191 MUVIEW_X11 := $(OUT)/mupdf-x11
194-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) 192-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
195+MUVIEW_X11 := $(OUT)/platform/x11/mupdf 
196+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo) 193+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
197 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) 194 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
198 $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) 195 $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS)
199 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) 196 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
200 $(LINK_CMD) $(X11_LIBS) 197@@ -271,7 +264,7 @@ $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
 198
 199 ifeq "$(HAVE_GLFW)" "yes"
 200 MUVIEW_GLFW := $(OUT)/mupdf-gl
 201-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
 202+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo)
 203 $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
 204 $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB)
 205 $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
 206@@ -279,8 +272,8 @@ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
 207 endif
201  208
202 ifeq "$(HAVE_CURL)" "yes" 209 ifeq "$(HAVE_CURL)" "yes"
203-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl 210-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
204-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) 211-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
205+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf 212+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf
206+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo) 213+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
207 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) 214 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
208 $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) 215 $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB)
209 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) 216 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
210@@ -279,7 +272,7 @@ endif 217@@ -290,7 +283,7 @@ endif
211  218
212 ifeq "$(HAVE_WIN32)" "yes" 219 ifeq "$(HAVE_WIN32)" "yes"
213 MUVIEW_WIN32 := $(OUT)/mupdf 220 MUVIEW_WIN32 := $(OUT)/mupdf
214-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) 221-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
215+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo) 222+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
216 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) 223 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
217 $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) 224 $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS)
218 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) 225 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
219@@ -289,7 +282,12 @@ endif 226@@ -300,7 +293,12 @@ endif
220 MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) 227 MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
221 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) 228 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
222  229
223-INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) 230-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL)
224+INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUJSTEST) 231+INSTALL_APPS := $(MUTOOL) $(MUJSTEST)
225+ifeq "$(HAVE_CURL)" "yes" 232+ifeq "$(HAVE_CURL)" "yes"
226+INSTALL_APPS += $(MUVIEW_CURL) 233+INSTALL_APPS += $(MUVIEW_CURL)
227+else ifeq "$(HAVE_X11)" "yes" 234+else ifeq "$(HAVE_X11)" "yes"
228+INSTALL_APPS += $(MUVIEW) 235+INSTALL_APPS += $(MUVIEW)
229+endif 236+endif
230  237
231 # --- Examples --- 238 # --- Examples ---
232  239
233@@ -331,24 +329,26 @@ libs: $(INSTALL_LIBS) 240@@ -343,24 +341,26 @@ libs: $(INSTALL_LIBS)
234 apps: $(INSTALL_APPS) 241 apps: $(INSTALL_APPS)
235  242
236 install: libs apps 243 install: libs apps
237- install -d $(DESTDIR)$(incdir)/mupdf 244- install -d $(DESTDIR)$(incdir)/mupdf
238- install -d $(DESTDIR)$(incdir)/mupdf/fitz 245- install -d $(DESTDIR)$(incdir)/mupdf/fitz
239- install -d $(DESTDIR)$(incdir)/mupdf/pdf 246- install -d $(DESTDIR)$(incdir)/mupdf/pdf
240- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf 247- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
241- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz 248- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
242- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf 249- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
243- 250-
244- install -d $(DESTDIR)$(libdir) 251- install -d $(DESTDIR)$(libdir)
245- install $(INSTALL_LIBS) $(DESTDIR)$(libdir) 252- install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
246- 253-