blob: fcfc479fbc5621817e1a6f41fe7f7dfa89768fa6 [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001From 3b43f93ec02611c4d554612953f5b64765b8683b Mon Sep 17 00:00:00 2001
2From: Chris Liddell <chris.liddell@artifex.com>
3Date: Wed, 13 Jan 2016 02:14:55 -0500
4Subject: [PATCH 2/2] Bug 696497 (part 2): fix support for building with a JPX
5 decoder
6
7Author: Chris Liddell <chris.liddell@artifex.com>
8
9Upstream-Status: Backport
10http://bugs.ghostscript.com/show_bug.cgi?id=696497
11http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b0f5a975
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 base/lib.mak | 3 +++
15 psi/int.mak | 3 +++
16 2 files changed, 6 insertions(+)
17
18diff --git a/base/lib.mak b/base/lib.mak
19index daa7056..8853dd5 100644
20--- a/base/lib.mak
21+++ b/base/lib.mak
22@@ -1774,6 +1774,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
23 $(gdebug_h) $(strimpl_h) $(sjpx_h) $(MAKEDIRS)
24 $(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c
25
26+$(GLD)sjpx_.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS)
27+ $(SETMOD) $(GLD)sjpx_
28+
29 # luratech version
30 sjpx_luratech=$(GLOBJ)sjpx_luratech.$(OBJ)
31 $(GLD)sjpx_luratech.dev : $(LIB_MAK) $(ECHOGS_XE) \
32diff --git a/psi/int.mak b/psi/int.mak
33index f9d667d..db01b65 100644
34--- a/psi/int.mak
35+++ b/psi/int.mak
36@@ -1290,6 +1290,9 @@ $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\
37 $(MAKEDIRS)
38 $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev
39
40+$(PSD)jpx_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)
41+ $(SETMOD) $(PSD)jpx_
42+
43 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
44
45 $(PSOBJ)zfjpx.$(OBJ) : $(PSSRC)zfjpx.c $(OP) $(memory__h)\
46--
471.9.1
48