sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e36d557c9c69f59f9e53a7292f1ecfb66d1b2510)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e36d557c9c69f59f9e53a7292f1ecfb66d1b2510)
- Date: Thu, 19 May 2016 16:18:30 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
graphics-libs/libspectre/DETAILS | 1
graphics-libs/libspectre/HISTORY | 4
graphics-libs/libspectre/PRE_BUILD | 5
printer/ghostscript/DETAILS | 7
printer/ghostscript/HISTORY | 5
printer/ghostscript/PRE_BUILD | 7
printer/ghostscript/error-header.patch | 39
printer/ghostscript/jbig2dec_1.patch | 75 -
printer/ghostscript/jbig2dec_2.patch | 42
printer/ghostscript/zlib.patch | 1964
---------------------------------
qt5-deprecated/qtwebkit/CONFLICTS | 1
qt5-deprecated/qtwebkit/DEPENDS | 6
qt5-deprecated/qtwebkit/HISTORY | 4
qt5-deprecated/qtwebkit/pthread.diff | 14
xorg-extras/xterm/DETAILS | 2
xorg-extras/xterm/HISTORY | 3
xorg-lib/libxcb/DEPENDS | 2
xorg-lib/libxcb/DETAILS | 6
xorg-lib/libxcb/HISTORY | 5
xorg-lib/libxcb/PRE_BUILD | 8
xorg-proto/xcb-proto/DETAILS | 6
xorg-proto/xcb-proto/HISTORY | 3
22 files changed, 62 insertions(+), 2147 deletions(-)
New commits:
commit e36d557c9c69f59f9e53a7292f1ecfb66d1b2510
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libxcb: => 1.12
commit c7d966cf79cd25886360d8872da212cc73d86a9c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xcb-proto: => 1.12
commit 450e0394c945d4e2183f6add7d4bcd949973fd3b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebkit - extra depends, conflicts self
commit 12fc92c750140d6e2c38480269ae04d20e6e273b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
- libspectre - build against recent ghostscript
commit 24553220ef23b8477654515914ce2802a3e53e3b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
ghostscript: => 9.19
commit de3414841d9bf6204609818752719fe3b3fa2a93
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xterm: => 324
diff --git a/graphics-libs/libspectre/DETAILS
b/graphics-libs/libspectre/DETAILS
index 2925f3a..9ff4e2c 100755
--- a/graphics-libs/libspectre/DETAILS
+++ b/graphics-libs/libspectre/DETAILS
@@ -1,5 +1,6 @@
SPELL=libspectre
VERSION=0.2.7
+ PATCHLEVEL=1
SOURCE_HASH=sha512:2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics-libs/libspectre/HISTORY
b/graphics-libs/libspectre/HISTORY
index db6dfa3..bfddac1 100644
--- a/graphics-libs/libspectre/HISTORY
+++ b/graphics-libs/libspectre/HISTORY
@@ -1,3 +1,7 @@
+2016-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, fix for new ghostscript
+
2012-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.7
diff --git a/graphics-libs/libspectre/PRE_BUILD
b/graphics-libs/libspectre/PRE_BUILD
new file mode 100755
index 0000000..9d0e365
--- /dev/null
+++ b/graphics-libs/libspectre/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -e
's/e_ExecStackUnderflow/gs_error_execstackoverflow/;s/e_Fatal/gs_error_unknownerror/'
\
+ -e 's/e_NeedInput/gs_error_stackunderflow/' \
+ -i libspectre/spectre-gs.c
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 8fa437e..557e563 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,10 +1,11 @@
SPELL=ghostscript
- VERSION=9.18
-
SOURCE_HASH=sha512:1ea0911cbdd6861ddadf4d4ff3b0fa043885162a8a3ce730e3cec2402cc591c1c3abc31680c7444b7e5b59e56d0d567649ac7394dda94ab830fb197b4d277e1f
+ VERSION=9.19
+ VX=gs919
+
SOURCE_HASH=sha512:d92d05c90ab4849ccca0d8aa0c583d41da3fe6089fd724a84f1fbddb3e65e116ee064ae0933b77019609332f765840146b62607e2f94dbfff90aa0597e1271ea
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/
- SOURCE_URL[0]=http://downloads.ghostscript.com/public/$SOURCE
+
SOURCE_URL[0]=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/$VX/$SOURCE
LICENSE[0]=GPL
ENTERED=20010922
SECURITY_PATCH=1
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 407cc33..aecc01d 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,8 @@
+2016-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.19
+ now download from github
+ * PRE_BUILD, *.patch: delete all patches
+
2016-02-19 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD, error-header.patch: fix installed headers
* jbig2dec*.patch: fix patch incompatibility
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index 9aaa5e1..ac46868 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -1,9 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib &&
-# fix compiler error for case --without-jbig2dec
-patch -p1 < "$SPELL_DIRECTORY/jbig2dec_1.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/jbig2dec_2.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/zlib.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/error-header.patch"
+rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib
diff --git a/printer/ghostscript/error-header.patch
b/printer/ghostscript/error-header.patch
deleted file mode 100644
index b2eb83d..0000000
--- a/printer/ghostscript/error-header.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Chris Liddell <chris.liddell AT artifex.com>
-Date: Fri, 23 Oct 2015 09:16:11 +0000 (+0100)
-Subject: Bug 696301: add gserrors.h to the installed files
-X-Git-Url:
http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=feafe5e540a0545ec5d28f3f66bb542056bba495
-
-Bug 696301: add gserrors.h to the installed files
-
-for the so-install target.
-
-Also remove a spurious (copy'n'paste error) comment.
-
-No cluster differences
----
-
-diff --git a/base/gserrors.h b/base/gserrors.h
-index 5f18081..cdebb38 100644
---- a/base/gserrors.h
-+++ b/base/gserrors.h
-@@ -25,7 +25,7 @@
- /* We don't use a typedef internally to avoid a lot of casting. */
-
- enum gs_error_type {
-- gs_error_ok = 0, /* unknown error */
-+ gs_error_ok = 0,
- gs_error_unknownerror = -1, /* unknown error */
- gs_error_dictfull = -2,
- gs_error_dictstackoverflow = -3,
-diff --git a/base/unix-dll.mak b/base/unix-dll.mak
-index 7b67aa1..73b4fa9 100644
---- a/base/unix-dll.mak
-+++ b/base/unix-dll.mak
-@@ -184,6 +184,7 @@ install-so-subtarget: so-subtarget
- ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- $(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
- $(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
-+ $(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
- $(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
-
- soinstall:
diff --git a/printer/ghostscript/jbig2dec_1.patch
b/printer/ghostscript/jbig2dec_1.patch
deleted file mode 100644
index f3774fc..0000000
--- a/printer/ghostscript/jbig2dec_1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From b0f5a97512332ecf2ec7cf1cc413fe7305a4060e Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell AT artifex.com>
-Date: Thu, 7 Jan 2016 12:33:45 +0000
-Subject: [PATCH] Bug 696497: Fix support for building with no jbig2 decoder
-
----
- base/lib.mak | 9 +++++++++
- psi/int.mak | 22 ++++++++++++++++++----
- 2 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/base/lib.mak b/base/lib.mak
-index 1efc341..4d7db1f 100644
---- a/base/lib.mak
-+++ b/base/lib.mak
-@@ -1732,6 +1732,10 @@ $(GLD)sjbig2_jbig2dec.dev : $(LIB_MAK) $(ECHOGS_XE) \
- $(SETMOD) $(GLD)sjbig2_jbig2dec $(sjbig2_jbig2dec)
- $(ADDMOD) $(GLD)sjbig2_jbig2dec -include $(GLD)jbig2dec.dev
-
-+$(GLD)sjbig2_.dev : $(LIB_MAK) $(ECHOGS_XE) \
-+ $(LIB_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(GLD)sjbig2_
-+
- # jbig2dec.dev is defined in jbig2.mak
-
- $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \
-@@ -1739,6 +1743,11 @@ $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \
- $(sjbig2_h) $(strimpl_h) $(MAKEDIRS)
- $(GLJBIG2CC) $(GLO_)sjbig2.$(OBJ) $(C_) $(GLSRC)sjbig2.c
-
-+$(GLOBJ)snojbig2.$(OBJ) : $(GLSRC)snojbig2.c $(AK) \
-+ $(stdint__h) $(memory__h) $(stdio__h) $(gserrors_h) $(gdebug_h) \
-+ $(strimpl_h) $(LIB_MAK) $(MAKEDIRS)
-+ $(GLJBIG2CC) $(GLO_)snojbig2.$(OBJ) $(C_) $(GLSRC)snojbig2.c
-+
- # luratech version
- sjbig2_luratech=$(GLOBJ)sjbig2_luratech.$(OBJ)
-
-diff --git a/psi/int.mak b/psi/int.mak
-index 05b5fec..2c6d6d0 100644
---- a/psi/int.mak
-+++ b/psi/int.mak
-@@ -1254,11 +1254,25 @@ $(PSOBJ)zfaes.$(OBJ) : $(PSSRC)zfaes.c $(OP)
$(memory__h)\
- # this can be turned on and off with a FEATURE_DEV
-
- fjbig2_=$(PSOBJ)zfjbig2_$(JBIG2_LIB).$(OBJ)
--$(PSD)jbig2.dev : $(INT_MAK) $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
-- $(MAKEDIRS)
-- $(SETMOD) $(PSD)jbig2 $(fjbig2_)
-- $(ADDMOD) $(PSD)jbig2 -include $(GLD)sjbig2
-- $(ADDMOD) $(PSD)jbig2 -oper zfjbig2
-+
-+$(PSD)jbig2_jbig2dec.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
-+ $(INT_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(PSD)jbig2_jbig2dec $(fjbig2_)
-+ $(ADDMOD) $(PSD)jbig2_jbig2dec -include $(GLD)sjbig2
-+ $(ADDMOD) $(PSD)jbig2_jbig2dec -oper zfjbig2
-+
-+$(PSD)jbig2_luratech.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
-+ $(INT_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(PSD)jbig2_luratech $(fjbig2_)
-+ $(ADDMOD) $(PSD)jbig2_luratech -include $(GLD)sjbig2
-+ $(ADDMOD) $(PSD)jbig2_luratech -oper zfjbig2
-+
-+$(PSD)jbig2_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(PSD)jbig2_
-+
-+$(PSD)jbig2.dev : $(PSD)jbig2_$(JBIG2_LIB).dev $(INT_MAK) $(MAKEDIRS)
-+ $(CP_) $(PSD)jbig2_$(JBIG2_LIB).dev $(PSD)jbig2.dev
-+
-
- $(PSOBJ)zfjbig2_jbig2dec.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\
- $(gsstruct_h) $(gstypes_h) $(ialloc_h) $(idict_h) $(ifilter_h)\
---
-2.7.0
-
diff --git a/printer/ghostscript/jbig2dec_2.patch
b/printer/ghostscript/jbig2dec_2.patch
deleted file mode 100644
index fd0ee76..0000000
--- a/printer/ghostscript/jbig2dec_2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4b7b278daa5a8290681de6ad157060fb2e9068ea Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell AT artifex.com>
-Date: Fri, 8 Jan 2016 15:42:30 +0000
-Subject: [PATCH] Bug 696497 (part 2): fix support for building with a JPX
- decoder
-
----
- base/lib.mak | 3 +++
- psi/int.mak | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/base/lib.mak b/base/lib.mak
-index 4d7db1f..a0a97cd 100644
---- a/base/lib.mak
-+++ b/base/lib.mak
-@@ -1774,6 +1774,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
- $(gdebug_h) $(strimpl_h) $(sjpx_h) $(MAKEDIRS)
- $(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c
-
-+$(GLD)sjpx_.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(GLD)sjpx_
-+
- # luratech version
- sjpx_luratech=$(GLOBJ)sjpx_luratech.$(OBJ)
- $(GLD)sjpx_luratech.dev : $(LIB_MAK) $(ECHOGS_XE) \
-diff --git a/psi/int.mak b/psi/int.mak
-index 2c6d6d0..8b224ea 100644
---- a/psi/int.mak
-+++ b/psi/int.mak
-@@ -1291,6 +1291,9 @@ $(PSD)jpx.dev : $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\
- $(MAKEDIRS)
- $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev
-
-+$(PSD)jpx_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)
-+ $(SETMOD) $(PSD)jpx_
-+
- fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
-
- $(PSOBJ)zfjpx.$(OBJ) : $(PSSRC)zfjpx.c $(OP) $(memory__h)\
---
-2.7.0
-
diff --git a/printer/ghostscript/zlib.patch b/printer/ghostscript/zlib.patch
deleted file mode 100644
index 9f5a230..0000000
--- a/printer/ghostscript/zlib.patch
+++ /dev/null
@@ -1,1964 +0,0 @@
-X-Git-Url:
http://git.ghostscript.com/?p=ghostpdl.git;a=blobdiff_plain;f=devices%2Fdevs.mak;h=5aa90a8410f422dafab1d775030634f94b1e5c78;hp=2cb883cbcc8154aacde9989ffb846f35a50a50da;hb=HEAD;hpb=d94669ba0009288630bcec80a3dd725cfa7ba002
-
-diff --git a/devices/devs.mak b/devices/devs.mak
-index 2cb883c..5aa90a8 100644
---- a/devices/devs.mak
-+++ b/devices/devs.mak
-@@ -15,7 +15,7 @@
- # makefile for Artifex's device drivers.
-
- # Define the name of this makefile.
--DEVS_MAK=$(DEVSRC)devs.mak
-+DEVS_MAK=$(DEVSRC)devs.mak $(TOP_MAKEFILES)
-
- DEVSRC=$(DEVSRCDIR)$(D)
- DEVVEC=$(DEVSRC)vector
-@@ -292,19 +292,19 @@ GDEVLWFJB2JPXCC=$(CC_) $(I_)$(DEVI_)
$(II)$(LDF_JB2I_) $(II)$(LWF_JPXI_)$(_I) $
-
- # Implement dynamic color management for 8-bit mapped color displays.
- $(DEVOBJ)gdev8bcm.$(OBJ) : $(DEVSRC)gdev8bcm.c $(AK)\
-- $(gx_h) $(gxdevice_h) $(gdev8bcm_h) $(MAKEDIRS)
-+ $(gx_h) $(gxdevice_h) $(gdev8bcm_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdev8bcm.$(OBJ) $(C_) $(DEVSRC)gdev8bcm.c
-
- # Generate Canon BJC command sequences.
- $(DEVOBJ)gdevcbjc.$(OBJ) : $(DEVSRC)gdevcbjc.c $(AK)\
-- $(std_h) $(stream_h) $(gdevcbjc_h) $(MAKEDIRS)
-+ $(std_h) $(stream_h) $(gdevcbjc_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevcbjc.$(OBJ) $(C_) $(DEVSRC)gdevcbjc.c
-
- # Support for writing PostScript (high- or low-level).
- $(DEVOBJ)gdevpsu.$(OBJ) : $(DEVVECSRC)gdevpsu.c $(GX) $(GDEV) $(math__h)
$(time__h)\
- $(stat__h) $(unistd__h)\
- $(gdevpsu_h) $(gscdefs_h) $(gxdevice_h)\
-- $(spprint_h) $(stream_h) $(MAKEDIRS)
-+ $(spprint_h) $(stream_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsu.c
-
- ###### ------------------- MS-DOS display devices ------------------- ######
-@@ -323,25 +323,25 @@ EGAVGA=$(EGAVGA_DOS)
-
- #**************** $(CCD) gdevevga.c
- $(DEVOBJ)gdevevga.$(OBJ) : $(DEVSRC)gdevevga.c $(GDEV) $(memory__h)
$(gdevpcfb_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevevga.$(OBJ) $(C_) $(DEVSRC)gdevevga.c
-
- $(DEVOBJ)gdevsco.$(OBJ) : $(DEVSRC)gdevsco.c $(GDEV) $(memory__h)
$(gdevpcfb_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevsco.$(OBJ) $(C_) $(DEVSRC)gdevsco.c
-
- # Common code for MS-DOS and SCO.
- #**************** $(CCD) gdevpcfb.c
- $(DEVOBJ)gdevpcfb.$(OBJ) : $(DEVSRC)gdevpcfb.c $(GDEV) $(memory__h)\
-- $(gdevpccm_h) $(gdevpcfb_h) $(gsparam_h) $(MAKEDIRS)
-+ $(gdevpccm_h) $(gdevpcfb_h) $(gsparam_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpcfb.$(OBJ) $(C_) $(DEVSRC)gdevpcfb.c
-
- # The EGA/VGA family includes EGA and VGA. Many SuperVGAs in 800x600,
- # 16-color mode can share the same code; see the next section below.
--$(DD)ega.dev : $(DEVS_MAK) $(EGAVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)ega.dev : $(EGAVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)ega $(EGAVGA)
-
--$(DD)vga.dev : $(DEVS_MAK) $(EGAVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)vga.dev : $(EGAVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)vga $(EGAVGA)
-
- ### ------------------------- SuperVGA displays ------------------------ ###
-@@ -353,7 +353,7 @@ $(DD)vga.dev : $(DEVS_MAK) $(EGAVGA) $(GDEV) $(MAKEDIRS)
- # where NNN is the display mode in decimal. See Use.htm for the modes
- # for some popular display chipsets.
-
--$(DD)svga16.dev : $(DEVS_MAK) $(EGAVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)svga16.dev : $(EGAVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)svga16 $(EGAVGA)
-
- # More capable SuperVGAs have a wide variety of slightly differing
-@@ -364,40 +364,40 @@ SVGA=$(DEVOBJ)gdevsvga.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
- #**************** $(CCD) gdevsvga.c
- $(DEVOBJ)gdevsvga.$(OBJ) : $(DEVSRC)gdevsvga.c $(GDEV) $(memory__h)\
- $(gsparam_h) $(gxarith_h) $(gdevpccm_h) $(gdevpcfb_h) $(gdevsvga_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevsvga.$(OBJ) $(C_) $(DEVSRC)gdevsvga.c
-
- # The SuperVGA family includes: Avance Logic Inc., ATI Wonder, S3,
- # Trident, Tseng ET3000/4000, and VESA.
-
--$(DD)ali.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)ali.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)ali $(SVGA)
-
--$(DD)atiw.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)atiw.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)atiw $(SVGA)
-
--$(DD)cirr.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)cirr.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)cirr $(SVGA)
-
--$(DD)tseng.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)tseng.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)tseng $(SVGA)
-
--$(DD)tvga.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)tvga.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)tvga $(SVGA)
-
--$(DD)vesa.dev : $(DEVS_MAK) $(SVGA) $(GDEV) $(MAKEDIRS)
-+$(DD)vesa.dev : $(SVGA) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)vesa $(SVGA)
-
- # The S3 driver doesn't share much code with the others.
-
- s3vga_=$(DEVOBJ)gdevs3ga.$(OBJ) $(DEVOBJ)gdevsvga.$(OBJ)
$(DEVOBJ)gdevpccm.$(OBJ)
--$(DD)s3vga.dev : $(DEVS_MAK) $(SVGA) $(s3vga_) $(GDEV) $(MAKEDIRS)
-+$(DD)s3vga.dev : $(SVGA) $(s3vga_) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)s3vga $(SVGA)
- $(ADDMOD) $(DD)s3vga -obj $(s3vga_)
-
- #**************** $(CCD) gdevs3ga.c
- $(DEVOBJ)gdevs3ga.$(OBJ) : $(DEVSRC)gdevs3ga.c $(GDEV) $(gdevpcfb_h)
$(gdevsvga_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevs3ga.$(OBJ) $(C_) $(DEVSRC)gdevs3ga.c
-
- ###### ----------------------- Other displays ------------------------
######
-@@ -406,13 +406,13 @@ $(DEVOBJ)gdevs3ga.$(OBJ) : $(DEVSRC)gdevs3ga.c $(GDEV)
$(gdevpcfb_h) $(gdevsvga_
-
- display_=$(DEVOBJ)gdevdsp.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
$(GLOBJ)gdevdevn.$(OBJ) \
- $(GLOBJ)gsequivc.$(OBJ) $(DEVOBJ)gdevdcrd.$(OBJ)
--$(DD)display.dev : $(display_) $(GDEV) $(MAKEDIRS)
-+$(DD)display.dev : $(display_) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)display $(display_)
-
- $(DEVOBJ)gdevdsp.$(OBJ) : $(DEVSRC)gdevdsp.c $(string__h)\
- $(gp_h) $(gpcheck_h) $(gdevpccm_h) $(gsparam_h) $(gsdevice_h)\
- $(GDEVH) $(gxdevmem_h) $(gdevdevn_h) $(gsequivc_h) $(gdevdsp_h)
$(gdevdsp2_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevdsp.$(OBJ) $(C_) $(DEVSRC)gdevdsp.c
-
-
-@@ -425,29 +425,29 @@ $(DEVOBJ)gdevdsp.$(OBJ) : $(DEVSRC)gdevdsp.c
$(string__h)\
- ### Note that the vgalib device supports only 16-color VGA modes.
###
-
- lvga256_=$(DEVOBJ)gdevl256.$(OBJ)
--$(DD)lvga256.dev : $(DEVS_MAK) $(lvga256_) $(GDEV) $(MAKEDIRS)
-+$(DD)lvga256.dev : $(lvga256_) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)lvga256 $(lvga256_)
- $(ADDMOD) $(DD)lvga256 -lib vga vgagl
-
--$(DEVOBJ)gdevl256.$(OBJ) : $(DEVSRC)gdevl256.c $(GDEV) $(memory__h)
$(MAKEDIRS)
-+$(DEVOBJ)gdevl256.$(OBJ) : $(DEVSRC)gdevl256.c $(GDEV) $(memory__h)
$(DEVS_MAK) $(MAKEDIRS)
- $(DEVCCSHARED) $(DEVO_)gdevl256.$(OBJ) $(C_) $(DEVSRC)gdevl256.c
-
- vgalib_=$(DEVOBJ)gdevvglb.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
--$(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_) $(GDEV) $(MAKEDIRS)
-+$(DD)vgalib.dev : $(vgalib_) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)vgalib $(vgalib_)
- $(ADDMOD) $(DD)vgalib -lib vga
-
- $(DEVOBJ)gdevvglb.$(OBJ) : $(DEVSRC)gdevvglb.c $(GDEV) $(gdevpccm_h)
$(gsparam_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCCSHARED) $(DEVO_)gdevvglb.$(OBJ) $(C_) $(DEVSRC)gdevvglb.c
-
- ### Shared library object supporting vgalib.
- ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
-
--$(DEVOBJ)lvga256.so : $(lvga256_) $(MAKEDIRS)
-+$(DEVOBJ)lvga256.so : $(lvga256_) $(DEVS_MAK) $(MAKEDIRS)
- $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)lvga256.so $(lvga256_) -lvga
-lvgagl
-
--$(DEVOBJ)vgalib.so : $(vgalib_) $(MAKEDIRS)
-+$(DEVOBJ)vgalib.so : $(vgalib_) $(DEVS_MAK) $(MAKEDIRS)
- $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)vgalib.so $(vgalib_) -lvga
-lvgagl
-
- ### -------------------------- The X11 device -------------------------- ###
-@@ -462,34 +462,34 @@ gdevx_h=$(DEVSRC)gdevx.h $(gdevbbox_h) $(gdevxcmp_h)
- # See the main makefile for the definition of XLIBDIRS and XLIBS.
- x11_=$(DEVOBJ)gdevx.$(OBJ) $(DEVOBJ)gdevxcmp.$(OBJ)
$(DEVOBJ)gdevxini.$(OBJ)\
- $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ)
--$(DD)x11_.dev : $(DEVS_MAK) $(x11_) $(GLD)bboxutil.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11_.dev : $(x11_) $(GLD)bboxutil.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)x11_ $(x11_)
- $(ADDMOD) $(DD)x11_ -link $(XLIBDIRS)
- $(ADDMOD) $(DD)x11_ -lib $(XLIBS)
- $(ADDMOD) $(DD)x11_ -include $(GLD)bboxutil
-
--$(DD)x11.dev : $(DEVS_MAK) $(DD)x11_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11.dev : $(DD)x11_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11 -include $(DD)x11_
-
- # See the main makefile for the definition of XINCLUDE.
- GDEVX=$(GDEV) $(x__h) $(gdevx_h) $(TOP_MAKEFILES)
- $(DEVOBJ)gdevx.$(OBJ) : $(DEVSRC)gdevx.c $(GDEVX) $(math__h) $(memory__h)\
- $(gscoord_h) $(gsdevice_h) $(gsiparm2_h) $(gsmatrix_h) $(gsparam_h)\
-- $(gxdevmem_h) $(gxgetbit_h) $(gxiparam_h) $(gxpath_h) $(MAKEDIRS)
-+ $(gxdevmem_h) $(gxgetbit_h) $(gxiparam_h) $(gxpath_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevx.$(OBJ) $(C_) $(DEVSRC)gdevx.c
-
- $(DEVOBJ)gdevxcmp.$(OBJ) : $(DEVSRC)gdevxcmp.c $(GDEVX) $(math__h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxcmp.$(OBJ) $(C_)
$(DEVSRC)gdevxcmp.c
-
- $(DEVOBJ)gdevxini.$(OBJ) : $(DEVSRC)gdevxini.c $(GDEVX) $(memory__h)\
-- $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h) $(MAKEDIRS)
-+ $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxini.$(OBJ) $(C_)
$(DEVSRC)gdevxini.c
-
- # We have to compile gdevxres without warnings, because there is a
- # const/non-const cast required by the X headers that we can't work around.
- $(DEVOBJ)gdevxres.$(OBJ) : $(DEVSRC)gdevxres.c $(std_h) $(x__h)\
-- $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h) $(MAKEDIRS)
-+ $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h) $(DEVS_MAK) $(MAKEDIRS)
- $(CC_NO_WARN) $(GLCCFLAGS) $(XINCLUDE) $(DEVO_)gdevxres.$(OBJ) $(C_)
$(DEVSRC)gdevxres.c
-
- # Alternate X11-based devices to help debug other drivers.
-@@ -504,48 +504,48 @@ $(DEVOBJ)gdevxres.$(OBJ) : $(DEVSRC)gdevxres.c
$(std_h) $(x__h)\
- # x11rg16x pretends to be a G5/B5/R6 color device.
- # x11rg16x pretends to be a G11/B10/R11 color device.
- x11alt_=$(DEVOBJ)gdevxalt.$(OBJ)
--$(DD)x11alt_.dev : $(DEVS_MAK) $(x11alt_) $(DD)x11_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11alt_.dev : $(x11alt_) $(DD)x11_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)x11alt_ $(x11alt_)
- $(ADDMOD) $(DD)x11alt_ -include $(DD)x11_
-
--$(DD)x11alpha.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11alpha.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11alpha -include $(DD)x11alt_
-
--$(DD)x11cmyk.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11cmyk.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11cmyk -include $(DD)x11alt_
-
--$(DD)x11cmyk2.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11cmyk2.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11cmyk2 -include $(DD)x11alt_
-
--$(DD)x11cmyk4.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11cmyk4.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11cmyk4 -include $(DD)x11alt_
-
--$(DD)x11cmyk8.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11cmyk8.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11cmyk8 -include $(DD)x11alt_
-
--$(DD)x11gray2.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11gray2.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11gray2 -include $(DD)x11alt_
-
--$(DD)x11gray4.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11gray4.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11gray4 -include $(DD)x11alt_
-
--$(DD)x11mono.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11mono.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11mono -include $(DD)x11alt_
-
--$(DD)x11rg16x.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11rg16x.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11rg16x -include $(DD)x11alt_
-
--$(DD)x11rg32x.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV) $(MAKEDIRS)
-+$(DD)x11rg32x.dev : $(DD)x11alt_.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)x11rg32x -include $(DD)x11alt_
-
- $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h)
$(memory__h)\
-- $(gsdevice_h) $(gsparam_h) $(gsstruct_h) $(GDEV) $(MAKEDIRS)
-+ $(gsdevice_h) $(gsparam_h) $(gsstruct_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxalt.$(OBJ) $(C_)
$(DEVSRC)gdevxalt.c
-
- ### Shared library object supporting X11.
- ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
-
--$(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS)
-+$(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
- $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_)
-L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
-
- ###### --------------- Memory-buffered printer devices ---------------
######
-@@ -554,23 +554,23 @@ $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS)
-
- atx_=$(DEVOBJ)gdevatx.$(OBJ)
-
--$(DD)atx23.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)atx23.dev : $(atx_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)atx23 $(atx_)
-
--$(DD)atx24.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)atx24.dev : $(atx_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)atx24 $(atx_)
-
--$(DD)atx38.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)atx38.dev : $(atx_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)atx38 $(atx_)
-
--$(DD)itk24i.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)itk24i.dev : $(atx_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)itk24i $(atx_)
-
--$(DD)itk38.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)itk38.dev : $(atx_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)itk38 $(atx_)
-
- $(DEVOBJ)gdevatx.$(OBJ) : $(DEVSRC)gdevatx.c $(PDEVH) $(math__h) $(GDEV) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevatx.$(OBJ) $(C_) $(DEVSRC)gdevatx.c
-
- ### ----------- The H-P DeskJet and LaserJet printer devices ----------- ###
-@@ -588,62 +588,62 @@ HPDLJM=$(DEVOBJ)gdevdljm.$(OBJ) $(HPPCL)
- HPMONO=$(DEVOBJ)gdevdjet.$(OBJ) $(HPDLJM)
-
- $(DEVOBJ)gdevpcl.$(OBJ) : $(DEVSRC)gdevpcl.c $(PDEVH) $(math__h)
$(gdevpcl_h)\
-- $(GDEV) $(MAKEDIRS)
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpcl.$(OBJ) $(C_) $(DEVSRC)gdevpcl.c
-
- $(DEVOBJ)gdevdljm.$(OBJ) : $(DEVSRC)gdevdljm.c $(PDEVH) $(gdevdljm_h)
$(GDEV) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevdljm.$(OBJ) $(C_) $(DEVSRC)gdevdljm.c
-
- $(DEVOBJ)gdevdjet.$(OBJ) : $(DEVSRC)gdevdjet.c $(PDEVH) $(gdevdljm_h)
$(GDEV) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevdjet.$(OBJ) $(C_) $(DEVSRC)gdevdjet.c
-
--$(DD)deskjet.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)deskjet.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)deskjet $(HPMONO)
-
--$(DD)djet500.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)djet500.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)djet500 $(HPMONO)
-
--$(DD)fs600.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)fs600.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)fs600 $(HPMONO)
-
--$(DD)laserjet.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)laserjet.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)laserjet $(HPMONO)
-
--$(DD)ljetplus.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljetplus.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljetplus $(HPMONO)
-
- ### Selecting ljet2p provides TIFF (mode 2) compression on LaserJet III,
- ### IIIp, IIId, IIIsi, IId, and IIp.
-
--$(DD)ljet2p.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljet2p.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljet2p $(HPMONO)
-
- ### Selecting ljet3 provides Delta Row (mode 3) compression on LaserJet III,
- ### IIIp, IIId, IIIsi.
-
--$(DD)ljet3.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljet3.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljet3 $(HPMONO)
-
- ### Selecting ljet3d also provides duplex printing capability.
-
--$(DD)ljet3d.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljet3d.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljet3d $(HPMONO)
-
- ### Selecting ljet4 or ljet4d also provides Delta Row compression on
- ### LaserJet IV series.
-
--$(DD)ljet4.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljet4.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljet4 $(HPMONO)
-
--$(DD)ljet4d.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ljet4d.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ljet4d $(HPMONO)
-
--$(DD)lp2563.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)lp2563.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)lp2563 $(HPMONO)
-
--$(DD)oce9050.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)oce9050.dev : $(HPMONO) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)oce9050 $(HPMONO)
-
- ### ------------------ The H-P LaserJet 5 and 6 devices -----------------
###
-@@ -663,21 +663,21 @@ gdevpxut_h=$(DEVSRC)gdevpxut.h
- $(DEVOBJ)gdevpxut.$(OBJ) : $(DEVSRC)gdevpxut.c $(math__h) $(string__h)\
- $(gx_h) $(gxdevcli_h) $(stream_h)\
- $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(GDEV) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpxut.$(OBJ) $(C_) $(DEVSRC)gdevpxut.c
-
- ljet5_=$(DEVOBJ)gdevlj56.$(OBJ) $(DEVOBJ)gdevpxut.$(OBJ) $(HPPCL)
--$(DD)lj5mono.dev : $(DEVS_MAK) $(ljet5_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)lj5mono.dev : $(ljet5_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV) $(DD)lj5mono $(ljet5_)
-
--$(DD)lj5gray.dev : $(DEVS_MAK) $(ljet5_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)lj5gray.dev : $(ljet5_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV) $(DD)lj5gray $(ljet5_)
-
- $(DEVOBJ)gdevlj56.$(OBJ) : $(DEVSRC)gdevlj56.c $(PDEVH) $(gdevpcl_h)\
- $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(stream_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevlj56.$(OBJ) $(C_) $(DEVSRC)gdevlj56.c
-
- ### -------------------- The ijs client ----------------- ###
-@@ -687,12 +687,12 @@ ijs_=$(DEVOBJ)gdevijs.$(OBJ)
- #$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
- # $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
-
--$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev $(GDEV) $(MAKEDIRS)
-+$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev $(GDEV) $(DEVS_MAK)
$(MAKEDIRS)
- $(SETPDEV) $(DD)ijs $(ijs_)
- $(ADDMOD) $(DD)ijs -include $(GLD)ijslib
-
- $(DEVOBJ)gdevijs.$(OBJ) : $(DEVSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
-- $(GDEV) $(MAKEDIRS)
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(CC_) $(I_)$(DEVI_) $(II)$(IJSI_)$(_I) $(II)$(IJSI_)$(D)..$(_I) \
- $(GLF_) $(DEVO_)gdevijs.$(OBJ) $(C_) $(DEVSRC)gdevijs.c
-
-@@ -715,36 +715,36 @@ rinkj_core=$(RINKJ_OBJ)evenbetter-rll.$(OBJ) \
- $(RINKJ_OBJ)rinkj-config.$(OBJ) $(RINKJ_OBJ)rinkj-dither.$(OBJ) \
- $(RINKJ_OBJ)rinkj-epson870.$(OBJ) $(RINKJ_OBJ)rinkj-screen-eb.$(OBJ)
-
--$(RINKJ_OBJ)evenbetter-rll.$(OBJ) : $(RINKJ_SRC)evenbetter-rll.c $(MAKEDIRS)
-+$(RINKJ_OBJ)evenbetter-rll.$(OBJ) : $(RINKJ_SRC)evenbetter-rll.c
$(DEVS_MAK) $(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)evenbetter-rll.$(OBJ) $(C_)
$(RINKJ_SRC)evenbetter-rll.c
-
--$(RINKJ_OBJ)rinkj-byte-stream.$(OBJ) : $(RINKJ_SRC)rinkj-byte-stream.c
$(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-byte-stream.$(OBJ) : $(RINKJ_SRC)rinkj-byte-stream.c
$(DEVS_MAK) $(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-byte-stream.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-byte-stream.c
-
--$(RINKJ_OBJ)rinkj-device.$(OBJ) : $(RINKJ_SRC)rinkj-device.c $(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-device.$(OBJ) : $(RINKJ_SRC)rinkj-device.c $(DEVS_MAK)
$(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-device.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-device.c
-
--$(RINKJ_OBJ)rinkj-config.$(OBJ) : $(RINKJ_SRC)rinkj-config.c $(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-config.$(OBJ) : $(RINKJ_SRC)rinkj-config.c $(DEVS_MAK)
$(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-config.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-config.c
-
--$(RINKJ_OBJ)rinkj-dither.$(OBJ) : $(RINKJ_SRC)rinkj-dither.c $(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-dither.$(OBJ) : $(RINKJ_SRC)rinkj-dither.c $(DEVS_MAK)
$(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-dither.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-dither.c
-
--$(RINKJ_OBJ)rinkj-epson870.$(OBJ) : $(RINKJ_SRC)rinkj-epson870.c $(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-epson870.$(OBJ) : $(RINKJ_SRC)rinkj-epson870.c
$(DEVS_MAK) $(MAKEDIRS)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-epson870.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-epson870.c
-
--$(RINKJ_OBJ)rinkj-screen-eb.$(OBJ) : $(RINKJ_SRC)rinkj-screen-eb.c
$(MAKEDIRS)
-+$(RINKJ_OBJ)rinkj-screen-eb.$(OBJ) : $(RINKJ_SRC)rinkj-screen-eb.c
$(DEVS_MAK) $(MAKEDIRS) $(gserrors_h)
- $(RINKJ_CC) $(RINKJ_O_)rinkj-screen-eb.$(OBJ) $(C_)
$(RINKJ_SRC)rinkj-screen-eb.c
-
- rinkj_=$(DEVOBJ)gdevrinkj.$(OBJ) $(rinkj_core)
-
--$(DD)rinkj.dev : $(DEVS_MAK) $(rinkj_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)rinkj.dev : $(rinkj_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)rinkj $(rinkj_)
-
- $(DEVOBJ)gdevrinkj.$(OBJ) : $(DEVSRC)gdevrinkj.c $(PDEVH) $(math__h)\
- $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
- $(gxdcconv_h) $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevrinkj.$(OBJ) $(C_) $(DEVSRC)gdevrinkj.c
-
-
-@@ -765,8 +765,8 @@ psdf_=$(psdf_1) $(psdf_2) $(psdf_3) $(psdf_4) $(psdf_5)
- psdf_inc1=$(GLD)vector.dev $(GLD)pngp.dev $(GLD)seexec.dev
- psdf_inc2=$(GLD)sdcte.dev $(GLD)slzwe.dev $(GLD)szlibe.dev
- psdf_inc=$(psdf_inc1) $(psdf_inc2)
--$(DD)psdf.dev : $(DEVS_MAK) $(ECHOGS_XE) $(psdf_) $(psdf_inc) $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)psdf.dev : $(ECHOGS_XE) $(psdf_) $(psdf_inc) $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)psdf $(psdf_1)
- $(ADDMOD) $(DD)psdf -obj $(psdf_2)
- $(ADDMOD) $(DD)psdf -obj $(psdf_3)
-@@ -781,26 +781,26 @@ $(DEVOBJ)gdevpsdi.$(OBJ) : $(DEVVECSRC)gdevpsdi.c
$(GXERR)\
- $(scfx_h) $(slzwx_h) $(spngpx_h)\
- $(strimpl_h) $(szlibx_h)\
- $(gdevpsdf_h) $(gdevpsds_h) $(gxdevmem_h) $(gxcspace_h) $(gxparamx_h)\
-- $(sjbig2_luratech_h) $(sjpx_luratech_h) $(gsicc_manage_h) $(MAKEDIRS)
-+ $(sjbig2_luratech_h) $(sjpx_luratech_h) $(gsicc_manage_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpsdi.$(OBJ) $(C_)
$(DEVVECSRC)gdevpsdi.c
-
- $(DEVOBJ)gdevpsdp.$(OBJ) : $(DEVVECSRC)gdevpsdp.c $(GDEVH)\
- $(string__h) $(jpeglib__h)\
- $(scfx_h) $(sdct_h) $(slzwx_h) $(srlx_h) $(strimpl_h) $(szlibx_h)\
- $(gsparamx_h) $(gsutil_h) $(gdevpsdf_h)\
-- $(sjbig2_luratech_h) $(sjpx_luratech_h) $(MAKEDIRS)
-+ $(sjbig2_luratech_h) $(sjpx_luratech_h) $(DEVS_MAK) $(MAKEDIRS)
- $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpsdp.$(OBJ) $(C_)
$(DEVVECSRC)gdevpsdp.c
-
- $(DEVOBJ)gdevpsds.$(OBJ) : $(DEVVECSRC)gdevpsds.c $(GX) $(memory__h)\
- $(gserrors_h) $(gxdcconv_h) $(gdevpsds_h) $(gxbitmap_h)\
- $(gxcspace_h) $(gsdcolor_h) $(gscspace_h) $(gxdevcli_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsds.$(OBJ) $(C_) $(DEVVECSRC)gdevpsds.c
-
- $(DEVOBJ)gdevpsdu.$(OBJ) : $(DEVVECSRC)gdevpsdu.c $(GXERR)\
- $(jpeglib__h) $(memory__h) $(stdio__h)\
- $(sa85x_h) $(scfx_h) $(sdct_h) $(sjpeg_h) $(strimpl_h)\
-- $(gdevpsdf_h) $(spprint_h) $(gsovrc_h) $(MAKEDIRS)
-+ $(gdevpsdf_h) $(spprint_h) $(gsovrc_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVJCC) $(DEVO_)gdevpsdu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsdu.c
-
- # Plain text writer
-@@ -809,18 +809,18 @@ gdevagl_h=$(DEVVECSRC)gdevagl.h
-
- txtwrite_=$(DEVOBJ)gdevtxtw.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ)
-
--$(DD)txtwrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
-- $(gdevagl_h) $(MAKEDIRS)
-+$(DD)txtwrite.dev : $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
-+ $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)txtwrite $(txtwrite_)
-
- $(DEVOBJ)gdevtxtw.$(OBJ) : $(DEVVECSRC)gdevtxtw.c $(GDEV)\
- $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
- $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
-- $(gxistate_h) $(gxpath_h) $(gdevagl_h) $(MAKEDIRS)
-+ $(gxistate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevtxtw.$(OBJ) $(C_) $(DEVVECSRC)gdevtxtw.c
-
- $(DEVOBJ)gdevagl.$(OBJ) : $(DEVVECSRC)gdevagl.c $(GDEV)\
-- $(gdevagl_h) $(MAKEDIRS)
-+ $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevagl.$(OBJ) $(C_) $(DEVVECSRC)gdevagl.c
-
-
-@@ -844,15 +844,15 @@ pdfwrite_=$(pdfwrite1_) $(pdfwrite2_) $(pdfwrite3_)
$(pdfwrite4_)\
-
- # Since ps2write actually is a clone of pdfwrite,
- # we just depend on it.
--$(DD)ps2write.dev : $(DEVS_MAK) $(DD)pdfwrite.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)ps2write.dev : $(DD)pdfwrite.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)ps2write
- $(ADDMOD) $(DD)ps2write -include $(DD)pdfwrite.dev
-
- # Since eps2write actually is a clone of pdfwrite,
- # we just depend on it.
--$(DD)eps2write.dev : $(DEVS_MAK) $(DD)pdfwrite.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)eps2write.dev : $(DD)pdfwrite.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)eps2write
- $(ADDMOD) $(DD)eps2write -include $(DD)pdfwrite.dev
-
-@@ -860,11 +860,11 @@ $(DD)eps2write.dev : $(DEVS_MAK) $(DD)pdfwrite.dev
$(GDEV) \
- # the Orientation (Page dict /Rotate value). This is not part of the
- # pdfwrite device, but part of the PS interpreter so that the pdfwrite
- # device can be used with other top level interpreters (such as PCL).
--$(DD)pdfwrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(pdfwrite_)\
-+$(DD)pdfwrite.dev : $(ECHOGS_XE) $(pdfwrite_)\
- $(GLD)cmyklib.dev $(GLD)cfe.dev $(GLD)lzwe.dev\
- $(GLD)rle.dev $(GLD)sdcte.dev $(GLD)sdeparam.dev $(GLD)smd5.dev\
- $(GLD)szlibe.dev $(GLD)psdf.dev $(GLD)sarc4.dev $(DD)pdtext.dev $(GDEV) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)pdfwrite $(pdfwrite1_)
- $(ADDMOD) $(DD)pdfwrite $(pdfwrite2_)
- $(ADDMOD) $(DD)pdfwrite $(pdfwrite3_)
-@@ -895,21 +895,21 @@ opdfread_h=$(DEVVECSRC)opdfread.h
- $(DEVOBJ)gdevpdf.$(OBJ) : $(DEVVECSRC)gdevpdf.c $(GDEVH)\
- $(fcntl__h) $(memory__h) $(string__h) $(time__h) $(unistd__h) $(gp_h)\
- $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h) $(smd5_h) $(sarc4_h)\
-- $(gdevpdfb_h) $(gscms_h) $(MAKEDIRS)
-+ $(gdevpdfb_h) $(gscms_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdf.$(OBJ) $(C_) $(DEVVECSRC)gdevpdf.c
-
- $(DEVOBJ)gdevpdfb.$(OBJ) : $(DEVVECSRC)gdevpdfb.c\
- $(string__h) $(gx_h)\
- $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
- $(gserrors_h) $(gxcspace_h) $(gxdcolor_h) $(gxpcolor_h) $(gxhldevc_h)\
-- $(gsptype1_h) $(MAKEDIRS)
-+ $(gsptype1_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfb.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfb.c
-
- $(DEVOBJ)gdevpdfc.$(OBJ) : $(DEVVECSRC)gdevpdfc.c $(GXERR) $(math__h)
$(memory__h)\
- $(gdevpdfc_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
- $(gscie_h) $(gscindex_h) $(gscspace_h) $(gscdevn_h) $(gscsepr_h)
$(gsicc_h)\
- $(sstring_h) $(stream_h) $(strimpl_h) $(gxcspace_h) $(gxcdevn_h)
$(gscspace_h)\
-- $(gsicc_manage_h) $(MAKEDIRS)
-+ $(gsicc_manage_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfc.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfc.c
-
- $(DEVOBJ)gdevpdfd.$(OBJ) : $(DEVVECSRC)gdevpdfd.c $(math__h) $(memory__h)\
-@@ -917,19 +917,19 @@ $(DEVOBJ)gdevpdfd.$(OBJ) : $(DEVVECSRC)gdevpdfd.c
$(math__h) $(memory__h)\
- $(gxcoord_h) $(gxdevmem_h) $(gxcolor2_h) $(gxhldevc_h)\
- $(gsstate_h) $(gserrors_h) $(gsptype2_h) $(gsshade_h)\
- $(gzpath_h) $(gzcpath_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h)
$(gsutil_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfd.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfd.c
-
- $(DEVOBJ)gdevpdfe.$(OBJ) : $(DEVVECSRC)gdevpdfe.c\
- $(gx_h) $(gserrors_h) $(string__h) $(time__h) $(stream_h) $(gp_h)
$(smd5_h) $(gscdefs_h)\
-- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdtf_h) $(ConvertUTF_h)
$(MAKEDIRS)
-+ $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdtf_h) $(ConvertUTF_h)
$(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfe.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfe.c
-
- $(DEVOBJ)gdevpdfg.$(OBJ) : $(DEVVECSRC)gdevpdfg.c $(GXERR) $(math__h)
$(string__h)\
- $(memory__h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
- $(gsfunc0_h) $(gsstate_h) $(gxdcolor_h) $(gxpcolor_h) $(gxcolor2_h)
$(gsptype2_h)\
- $(gxbitmap_h) $(gxdht_h) $(gxfarith_h) $(gxfmap_h) $(gxht_h) $(gxistate_h)\
-- $(gzht_h) $(gsicc_manage_h) $(MAKEDIRS)
-+ $(gzht_h) $(gsicc_manage_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfg.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfg.c
-
- $(DEVOBJ)gdevpdfi.$(OBJ) : $(DEVVECSRC)gdevpdfi.c $(memory__h) $(math__h)\
-@@ -937,48 +937,48 @@ $(DEVOBJ)gdevpdfi.$(OBJ) : $(DEVVECSRC)gdevpdfi.c
$(memory__h) $(math__h)\
- $(gserrors_h) $(gsdevice_h) $(gsflip_h) $(gsiparm4_h) $(gsstate_h)
$(gscolor2_h)\
- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h)\
- $(gxcspace_h) $(gximage3_h) $(gximag3x_h) $(gxdcolor_h) $(gxpcolor_h)\
-- $(gxhldevc_h) $(gsicc_manage_h) $(MAKEDIRS)
-+ $(gxhldevc_h) $(gsicc_manage_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfi.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfi.c
-
- $(DEVOBJ)gdevpdfj.$(OBJ) : $(DEVVECSRC)gdevpdfj.c\
- $(memory__h) $(string__h) $(gx_h) $(gserrors_h)\
- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gxcspace_h)\
-- $(gsiparm4_h) $(gdevpsds_h) $(spngpx_h) $(MAKEDIRS)
-+ $(gsiparm4_h) $(gdevpsds_h) $(spngpx_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVJCC) $(DEVO_)gdevpdfj.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfj.c
-
- $(DEVOBJ)gdevpdfk.$(OBJ) : $(DEVVECSRC)gdevpdfk.c $(GXERR) $(math__h)
$(memory__h)\
- $(gdevpdfc_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
- $(gsicc_h) $(gxcie_h) $(gxcspace_h)\
-- $(stream_h) $(strimpl_h) $(MAKEDIRS)
-+ $(stream_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfk.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfk.c
-
- $(DEVOBJ)gdevpdfm.$(OBJ) : $(DEVVECSRC)gdevpdfm.c\
- $(math__h) $(memory__h) $(string__h) $(gx_h)\
- $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h)\
-- $(szlibx_h) $(slzwx_h) $(MAKEDIRS)
-+ $(szlibx_h) $(slzwx_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfm.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfm.c
-
- $(DEVOBJ)gdevpdfo.$(OBJ) : $(DEVVECSRC)gdevpdfo.c $(memory__h) $(string__h)\
- $(gx_h)\
- $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsparam_h) $(gsutil_h)\
-- $(sa85x_h) $(sarc4_h) $(strimpl_h) $(MAKEDIRS)
-+ $(sa85x_h) $(sarc4_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfo.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfo.c
-
- $(DEVOBJ)gdevpdfp.$(OBJ) : $(DEVVECSRC)gdevpdfp.c $(memory__h) $(string__h)
$(gx_h)\
- $(gdevpdfo_h) $(gdevpdfg_h) $(gdevpdfx_h) $(gserrors_h) $(gsparamx_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfp.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfp.c
-
- $(DEVOBJ)gdevpdfr.$(OBJ) : $(DEVVECSRC)gdevpdfr.c $(memory__h) $(string__h)\
- $(gx_h)\
- $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h)\
-- $(scanchar_h) $(sstring_h) $(strimpl_h) $(MAKEDIRS)
-+ $(scanchar_h) $(sstring_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfr.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfr.c
-
- $(DEVOBJ)gdevpdft.$(OBJ) : $(DEVVECSRC)gdevpdft.c $(string__h)\
- $(gx_h) $(gserrors_h) $(gstrans_h) $(gscolor2_h) $(gzstate_h)\
- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gsccolor_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdft.$(OBJ) $(C_) $(DEVVECSRC)gdevpdft.c
-
- $(DEVOBJ)gdevpdfu.$(OBJ) : $(DEVVECSRC)gdevpdfu.c $(GXERR)\
-@@ -989,13 +989,13 @@ $(DEVOBJ)gdevpdfu.$(OBJ) : $(DEVVECSRC)gdevpdfu.c
$(GXERR)\
- $(srlx_h) $(sarc4_h) $(smd5_h) $(sstring_h) $(strimpl_h) $(szlibx_h)\
- $(strmio_h) $(sjbig2_luratech_h) $(sjpx_luratech_h)\
- $(opdfread_h) $(gdevagl_h) $(gs_mro_e_h) $(gs_mgl_e_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpdfu.$(OBJ) $(C_)
$(DEVVECSRC)gdevpdfu.c
-
- $(DEVOBJ)gdevpdfv.$(OBJ) : $(DEVVECSRC)gdevpdfv.c $(GXERR) $(math__h)
$(string__h)\
- $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
- $(gscindex_h) $(gscoord_h) $(gsiparm3_h) $(gsmatrix_h) $(gsptype2_h)\
-- $(gxcolor2_h) $(gxdcolor_h) $(gxpcolor_h) $(gxshade_h) $(MAKEDIRS)
-+ $(gxcolor2_h) $(gxdcolor_h) $(gxpcolor_h) $(gxshade_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdfv.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfv.c
-
- # ---------------- Font writing ---------------- #
-@@ -1010,7 +1010,7 @@ psf_1=$(DEVOBJ)gdevpsf1.$(OBJ)
$(DEVOBJ)gdevpsf2.$(OBJ) $(DEVOBJ)gdevpsfm.$(OBJ)
- psf_2=$(DEVOBJ)gdevpsft.$(OBJ) $(DEVOBJ)gdevpsfu.$(OBJ)
$(DEVOBJ)gdevpsfx.$(OBJ)
- psf_3=$(DEVOBJ)spsdf.$(OBJ)
- psf_=$(psf_1) $(psf_2) $(psf_3)
--$(DD)psf.dev : $(DEV_MAK) $(ECHOGS_XE) $(psf_) $(MAKEDIRS)
-+$(DD)psf.dev : $(DEV_MAK) $(ECHOGS_XE) $(psf_) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)psf $(psf_1)
- $(ADDMOD) $(DD)psf -obj $(psf_2)
- $(ADDMOD) $(DD)psf -obj $(psf_3)
-@@ -1019,36 +1019,36 @@ $(DEVOBJ)gdevpsf1.$(OBJ) : $(DEVVECSRC)gdevpsf1.c
$(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gsccode_h) $(gsmatrix_h)\
- $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
- $(sfilter_h) $(sstring_h) $(stream_h) $(strimpl_h)\
-- $(gdevpsf_h) $(spprint_h) $(spsdf_h) $(math_h) $(MAKEDIRS)
-+ $(gdevpsf_h) $(spprint_h) $(spsdf_h) $(math_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsf1.$(OBJ) $(C_) $(DEVVECSRC)gdevpsf1.c
-
- $(DEVOBJ)gdevpsf2.$(OBJ) : $(DEVVECSRC)gdevpsf2.c $(AK) $(gx_h)\
- $(gserrors_h) $(math__h) $(memory__h) $(gxarith_h) $(gsutil_h)\
- $(gsccode_h) $(gscencs_h) $(gscrypt1_h) $(gsmatrix_h)\
- $(gxfcid_h) $(gxfixed_h) $(gxfont_h) $(gxfont1_h)\
-- $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
-+ $(stream_h) $(gdevpsf_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsf2.$(OBJ) $(C_) $(DEVVECSRC)gdevpsf2.c
-
- $(DEVOBJ)gdevpsfm.$(OBJ) : $(DEVVECSRC)gdevpsfm.c $(AK) $(gx_h)\
- $(gserrors_h) $(gdevpsf_h) $(gxfcmap_h) $(spprint_h) $(spsdf_h)
$(stream_h)\
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsfm.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfm.c
-
- $(DEVOBJ)gdevpsft.$(OBJ) : $(DEVVECSRC)gdevpsft.c $(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gscencs_h) $(gsmatrix_h) $(gsutil_h)\
- $(gxfcid_h) $(gxfont_h) $(gxfont42_h) $(gxttf_h)\
-- $(spprint_h) $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
-+ $(spprint_h) $(stream_h) $(gdevpsf_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsft.$(OBJ) $(C_) $(DEVVECSRC)gdevpsft.c
-
- $(DEVOBJ)gdevpsfu.$(OBJ) : $(DEVVECSRC)gdevpsfu.c $(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gsmatrix_h) $(gxfont_h) $(gdevpsf_h)\
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsfu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfu.c
-
- $(DEVOBJ)gdevpsfx.$(OBJ) : $(DEVVECSRC)gdevpsfx.c $(AK) $(gx_h)\
- $(gserrors_h) $(math__h) $(memory__h)\
- $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
-- $(stream_h) $(gdevpsf_h) $(gxistate_h) $(MAKEDIRS)
-+ $(stream_h) $(gdevpsf_h) $(gxistate_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsfx.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfx.c
-
- # ---------------- Font copying ---------------- #
-@@ -1057,14 +1057,14 @@ $(DEVOBJ)gdevpsfx.$(OBJ) : $(DEVVECSRC)gdevpsfx.c
$(AK) $(gx_h)\
- # only by pdfwrite.
-
- fcopy_=$(DEVOBJ)gxfcopy.$(OBJ)
--$(GLD)fcopy.dev : $(DEVS_MAK) $(ECHOGS_XE) $(fcopy_) $(MAKEDIRS)
-+$(GLD)fcopy.dev : $(ECHOGS_XE) $(fcopy_) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(GLD)fcopy $(fcopy_)
-
- $(DEVOBJ)gxfcopy.$(OBJ) : $(DEVSRC)gxfcopy.c $(memory__h) $(AK) $(gx_h)\
- $(gserrors_h) $(gscencs_h) $(gsline_h) $(gspaint_h) $(gspath_h)
$(gsstruct_h)\
- $(gsutil_h) $(gschar_h) $(gxfont_h) $(gxfont1_h) $(gxfont42_h) $(gxchar_h)\
- $(gxfcid_h) $(gxfcopy_h) $(gxfcache_h) $(gxistate_h) $(gxtext_h)
$(gxtype1_h)\
-- $(smd5_h) $(gzstate_h) $(gdevpsf_h) $(stream_h) $(MAKEDIRS)
-+ $(smd5_h) $(gzstate_h) $(gdevpsf_h) $(stream_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gxfcopy.$(OBJ) $(C_) $(DEVSRC)gxfcopy.c
-
- ######## pdfwrite text
-@@ -1073,7 +1073,7 @@ $(DEVOBJ)gxfcopy.$(OBJ) : $(DEVSRC)gxfcopy.c
$(memory__h) $(AK) $(gx_h)\
- # we give them their own module name and (for the new code) file name
prefix.
- # However, logically they are part of pdfwrite and cannot be used
separately.
-
--$(DD)pdtext.dev : $(DEVS_MAK) $(DD)pdxtext.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pdtext.dev : $(DD)pdxtext.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)pdtext -include $(DD)pdxtext
-
- # For a code roadmap, see gdevpdtx.h.
-@@ -1103,8 +1103,8 @@ pdxtext_xyz=
- pdxtext_=$(pdxtext_ab) $(pdxtext_cde) $(pdxtext_fgh) $(pdxtext_ijk)\
- $(pdxtext_lmn) $(pdxtext_opq) $(pdxtext_rst) $(pdxtext_uvw) $(pdxtext_xyz)\
- $(DEVOBJ)gsfont0c.$(OBJ)
--$(DD)pdxtext.dev : $(DEVS_MAK) $(pdxtext_) $(GDEV)\
-- $(GLD)fcopy.dev $(GLD)psf.dev $(MAKEDIRS)
-+$(DD)pdxtext.dev : $(pdxtext_) $(GDEV)\
-+ $(GLD)fcopy.dev $(GLD)psf.dev $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)pdxtext $(pdxtext_ab)
- $(ADDMOD) $(DD)pdxtext $(pdxtext_cde)
- $(ADDMOD) $(DD)pdxtext $(pdxtext_fgh)
-@@ -1119,51 +1119,51 @@ $(DD)pdxtext.dev : $(DEVS_MAK) $(pdxtext_) $(GDEV)\
-
- $(DEVOBJ)gdevpdt.$(OBJ) : $(DEVVECSRC)gdevpdt.c $(gx_h) $(gxpath_h)
$(memory__h)\
- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdtx_h)
$(gdevpdt_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdt.$(OBJ) $(C_) $(DEVVECSRC)gdevpdt.c
-
- $(DEVOBJ)gdevpdtb.$(OBJ) : $(DEVVECSRC)gdevpdtb.c $(memory__h) $(ctype__h)
$(string__h)\
- $(memory__h) $(ctype__h) $(string__h) $(gx_h) $(gserrors_h) $(gsutil_h)
$(gxfcid_h)\
- $(gxfcopy_h) $(gxfont_h) $(gxfont42_h) $(gdevpsf_h) $(gdevpdfx_h)
$(gdevpdfo_h)\
-- $(gdevpdtb_h) $(gdevpdfg_h) $(gdevpdtf_h) $(smd5_h) $(MAKEDIRS)
-+ $(gdevpdtb_h) $(gdevpdfg_h) $(gdevpdtf_h) $(smd5_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtb.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtb.c
-
- $(DEVOBJ)gdevpdtc.$(OBJ) : $(DEVVECSRC)gdevpdtc.c $(gx_h) $(memory__h)
$(string__h)\
- $(gserrors_h) $(gxfcmap_h) $(gxfont_h) $(gxfont0_h) $(gxfont0c_h)\
- $(gzpath_h) $(gxchar_h) $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdtx_h)\
-- $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) $(gdevpdtt_h) $(MAKEDIRS)
-+ $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) $(gdevpdtt_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtc.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtc.c
-
- $(DEVOBJ)gdevpdte.$(OBJ) : $(DEVVECSRC)gdevpdte.c $(gx_h) $(math__h)
$(memory__h) $(string__h)\
- $(gserrors_h) $(gsutil_h) $(gxfcmap_h) $(gxfcopy_h) $(gxfont_h) \
- $(gxfont0_h) $(gxfont0c_h) $(gxpath_h) $(gdevpsf_h) $(gdevpdfx_h) \
- $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdtx_h) $(gdevpdtd_h) $(gdevpdtf_h)
$(gdevpdts_h) \
-- $(gdevpdtt_h) $(MAKEDIRS)
-+ $(gdevpdtt_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdte.$(OBJ) $(C_) $(DEVVECSRC)gdevpdte.c
-
- $(DEVOBJ)gdevpdtd.$(OBJ) : $(DEVVECSRC)gdevpdtd.c $(math__h) $(memory__h)
$(gx_h)\
- $(gserrors_h) $(gsrect_h) $(gscencs_h)\
- $(gdevpdfo_h) $(gdevpdfx_h)\
-- $(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h) $(MAKEDIRS)
-+ $(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtd.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtd.c
-
- $(DEVOBJ)gdevpdtf.$(OBJ) : $(DEVVECSRC)gdevpdtf.c $(gx_h) $(memory__h)\
- $(string__h) $(gserrors_h) $(gsutil_h)\
- $(gxfcache_h) $(gxfcid_h) $(gxfcmap_h) $(gxfcopy_h) $(gxfont_h)
$(gxfont1_h)\
- $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h)
$(gdevpdtw_h)\
-- $(gdevpdti_h) $(MAKEDIRS)
-+ $(gdevpdti_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtf.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtf.c
-
- $(DEVOBJ)gdevpdti.$(OBJ) : $(DEVVECSRC)gdevpdti.c $(memory__h) $(string__h)
$(gx_h)\
- $(gserrors_h) $(gsutil_h)\
- $(gdevpdfx_h) $(gdevpdfg_h)\
- $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdts_h) $(gdevpdtw_h) $(gdevpdtt_h)
$(gdevpdfo_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdti.$(OBJ) $(C_) $(DEVVECSRC)gdevpdti.c
-
- $(DEVOBJ)gdevpdts.$(OBJ) : $(DEVVECSRC)gdevpdts.c $(gx_h) $(math__h)
$(memory__h)\
- $(gserrors_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtx_h) $(gdevpdtf_h)\
-- $(gdevpdts_h) $(gdevpdtt_h) $(MAKEDIRS)
-+ $(gdevpdts_h) $(gdevpdtt_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdts.$(OBJ) $(C_) $(DEVVECSRC)gdevpdts.c
-
- $(DEVOBJ)gdevpdtt.$(OBJ) : $(DEVVECSRC)gdevpdtt.c $(gx_h) $(math__h)
$(string__h)\
-@@ -1171,22 +1171,22 @@ $(DEVOBJ)gdevpdtt.$(OBJ) : $(DEVVECSRC)gdevpdtt.c
$(gx_h) $(math__h) $(string__h
- $(gxfcache_h) $(gxfont_h) $(gxfont0_h) $(gxfcid_h) $(gxfcopy_h)\
- $(gxfcmap_h) $(gxpath_h) $(gxchar_h) $(gxstate_h) $(gdevpdfx_h)
$(gdevpdfg_h)\
- $(gdevpdfo_h) $(gdevpdtx_h) $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h)
$(gdevpdtt_h)\
-- $(gdevpdti_h) $(gxhldevc_h) $(MAKEDIRS)
-+ $(gdevpdti_h) $(gxhldevc_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtt.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtt.c
-
- $(DEVOBJ)gdevpdtv.$(OBJ) : $(DEVVECSRC)gdevpdtv.c $(gx_h) $(gdevpdtv_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtv.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtv.c
-
- $(DEVOBJ)gdevpdtw.$(OBJ) : $(DEVVECSRC)gdevpdtw.c $(gx_h) $(gserrors_h)
$(memory__h)\
- $(gxfcmap_h) $(gxfont_h) $(gxfcopy_h) $(gscencs_h)\
- $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdfo_h)\
- $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdtw_h) $(gdevpdtv_h)
$(sarc4_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpdtw.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtw.c
-
- $(DEVOBJ)whitelst.$(OBJ) : $(DEVVECSRC)whitelst.c $(whitelst_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)whitelst.$(OBJ) $(C_) $(DEVVECSRC)whitelst.c
-
- ################ END PDF WRITER ################
-@@ -1194,13 +1194,13 @@ $(DEVOBJ)whitelst.$(OBJ) : $(DEVVECSRC)whitelst.c
$(whitelst_h) \
- # High-level PCL XL writer
-
- pxl_=$(DEVOBJ)gdevpx.$(OBJ) $(DEVOBJ)gdevpxut.$(OBJ) $(HPPCL)
--$(DD)pxlmono.dev : $(DEVS_MAK) $(pxl_) $(GDEV) $(GLD)vector.dev \
-- $(MAKEDIRS)
-+$(DD)pxlmono.dev : $(pxl_) $(GDEV) $(GLD)vector.dev \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)pxlmono $(pxl_)
- $(ADDMOD) $(DD)pxlmono -include $(GLD)vector
-
--$(DD)pxlcolor.dev : $(DEVS_MAK) $(pxl_) $(GDEV) $(GLD)vector.dev \
-- $(MAKEDIRS)
-+$(DD)pxlcolor.dev : $(pxl_) $(GDEV) $(GLD)vector.dev \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)pxlcolor $(pxl_)
- $(ADDMOD) $(DD)pxlcolor -include $(GLD)vector
-
-@@ -1210,7 +1210,7 @@ $(DEVOBJ)gdevpx.$(OBJ) : $(DEVVECSRC)gdevpx.c\
- $(gxcspace_h) $(gxdevice_h) $(gxpath_h)\
- $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(gdevvec_h)\
- $(srlx_h) $(strimpl_h) $(jpeglib__h) $(sdct_h) $(sjpeg_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpx.$(OBJ) $(C_) $(DEVVECSRC)gdevpx.c
-
- # XPS writer. Uses libtiff for all images
-@@ -1219,17 +1219,27 @@ libtiff_dev=$(TIFFGENDIR)$(D)libtiff.dev
- tiff_i_=-include $(TIFFGENDIR)$(D)libtiff
-
- xpswrite_=$(DEVOBJ)gdevxps.$(OBJ)
--$(DD)xpswrite.dev : $(DEVS_MAK) $(xpswrite_) $(GDEV) $(GLD)vector.dev \
--$(libtiff_dev) $(MAKEDIRS)
-+$(DD)xpswrite.dev : $(xpswrite_) $(GDEV) $(GLD)vector.dev \
-+$(libtiff_dev) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)xpswrite $(xpswrite_)
- $(ADDMOD) $(DD)xpswrite -include $(GLD)vector $(tiff_i_)
-
--$(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \
-+$(DEVOBJ)gdevxps_1.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \
-+$(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \
-+$(gxpath_h) $(gzcpath_h) $(stream_h) \
-+$(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \
-+$(gximdecode_h) $(DEVS_MAK) $(MAKEDIRS)
-+ $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps_1.$(OBJ) $(C_)
$(DEVVECSRC)gdevxps.c
-+
-+$(DEVOBJ)gdevxps_0.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \
- $(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \
- $(gxpath_h) $(gzcpath_h) $(stream_h) $(zlib_h) \
- $(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \
--$(gximdecode_h) $(MAKEDIRS)
-- $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_)
$(DEVVECSRC)gdevxps.c
-+$(gximdecode_h) $(DEVS_MAK) $(MAKEDIRS)
-+ $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps_0.$(OBJ) $(C_)
$(DEVVECSRC)gdevxps.c
-+
-+$(DEVOBJ)gdevxps.$(OBJ) : $(DEVOBJ)gdevxps_$(SHARE_ZLIB).$(OBJ) $(DEVS_MAK)
$(MAKEDIRS)
-+ $(CP_) $(DEVOBJ)gdevxps_$(SHARE_ZLIB).$(OBJ) $(DEVOBJ)gdevxps.$(OBJ)
-
- ###### --------------------- Raster file formats ---------------------
######
-
-@@ -1240,29 +1250,29 @@ $(gximdecode_h) $(MAKEDIRS)
-
- bit_=$(DEVOBJ)gdevbit.$(OBJ) $(DEVOBJ)gdevdcrd.$(OBJ)
-
--$(DD)bit.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bit.dev : $(bit_) $(GLD)page.dev $(GLD)cielib.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bit $(bit_)
- $(ADDMOD) $(DD)bit -include $(GLD)cielib
-
--$(DD)bitrgb.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev
$(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bitrgb.dev : $(bit_) $(GLD)page.dev $(GLD)cielib.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bitrgb $(bit_)
- $(ADDMOD) $(DD)bitrgb -include $(GLD)cielib
-
--$(DD)bitcmyk.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev
$(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bitcmyk.dev : $(bit_) $(GLD)page.dev $(GLD)cielib.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bitcmyk $(bit_)
- $(ADDMOD) $(DD)bitcmyk -include $(GLD)cielib
-
--$(DD)bitrgbtags.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bitrgbtags.dev : $(bit_) $(GLD)page.dev $(GLD)cielib.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bitrgbtags $(bit_)
- $(ADDMOD) $(DD)bitrgbtags -include $(GLD)cielib
-
- $(DEVOBJ)gdevbit.$(OBJ) : $(DEVSRC)gdevbit.c $(PDEVH)\
- $(gsparam_h) $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gxlum_h) $(gxdcconv_h)\
-- $(gsutil_h) $(MAKEDIRS)
-+ $(gsutil_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevbit.$(OBJ) $(C_) $(DEVSRC)gdevbit.c
-
- ### ------------------------- .BMP file formats -------------------------
###
-@@ -1272,43 +1282,43 @@ gdevbmp_h=$(DEVSRC)gdevbmp.h
- bmp_=$(DEVOBJ)gdevbmp.$(OBJ) $(DEVOBJ)gdevbmpc.$(OBJ)
$(DEVOBJ)gdevpccm.$(OBJ)
-
- $(DEVOBJ)gdevbmp.$(OBJ) : $(DEVSRC)gdevbmp.c $(PDEVH) $(gdevbmp_h)
$(gdevpccm_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevbmp.$(OBJ) $(C_) $(DEVSRC)gdevbmp.c
-
- $(DEVOBJ)gdevbmpc.$(OBJ) : $(DEVSRC)gdevbmpc.c $(PDEVH) $(gdevbmp_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevbmpc.$(OBJ) $(C_) $(DEVSRC)gdevbmpc.c
-
--$(DD)bmpmono.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmpmono.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpmono $(bmp_)
-
--$(DD)bmpgray.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmpgray.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpgray $(bmp_)
-
--$(DD)bmpsep1.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmpsep1.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpsep1 $(bmp_)
-
--$(DD)bmpsep8.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmpsep8.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpsep8 $(bmp_)
-
--$(DD)bmp16.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmp16.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmp16 $(bmp_)
-
--$(DD)bmp256.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmp256.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmp256 $(bmp_)
-
--$(DD)bmp16m.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmp16m.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmp16m $(bmp_)
-
--$(DD)bmp32b.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)bmp32b.dev : $(bmp_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmp32b $(bmp_)
-
- ### ------------- BMP driver that serves as demo of async rendering ---- ###
-@@ -1317,41 +1327,41 @@ bmpa_=$(DEVOBJ)gdevbmpa.$(OBJ)
$(DEVOBJ)gdevbmpc.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-
- $(DEVOBJ)gdevbmpa.$(OBJ) : $(DEVSRC)gdevbmpa.c $(AK) $(stdio__h)\
- $(gdevbmp_h) $(gdevprna_h) $(gdevpccm_h) $(gdevppla_h)\
-- $(gserrors_h) $(gpsync_h) $(MAKEDIRS)
-+ $(gserrors_h) $(gpsync_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevbmpa.$(OBJ) $(C_) $(DEVSRC)gdevbmpa.c
-
--$(DD)bmpamono.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpamono.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpamono $(bmpa_)
- $(ADDMOD) $(DD)bmpamono -include $(GLD)async
-
--$(DD)bmpasep1.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpasep1.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpasep1 $(bmpa_)
- $(ADDMOD) $(DD)bmpasep1 -include $(GLD)async
-
--$(DD)bmpasep8.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpasep8.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpasep8 $(bmpa_)
- $(ADDMOD) $(DD)bmpasep8 -include $(GLD)async
-
--$(DD)bmpa16.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpa16.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpa16 $(bmpa_)
- $(ADDMOD) $(DD)bmpa16 -include $(GLD)async
-
--$(DD)bmpa256.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpa256.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpa256 $(bmpa_)
- $(ADDMOD) $(DD)bmpa256 -include $(GLD)async
-
--$(DD)bmpa16m.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpa16m.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpa16m $(bmpa_)
- $(ADDMOD) $(DD)bmpa16m -include $(GLD)async
-
--$(DD)bmpa32b.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)bmpa32b.dev : $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)bmpa32b $(bmpa_)
- $(ADDMOD) $(DD)bmpa32b -include $(GLD)async
-
-@@ -1359,72 +1369,83 @@ $(DD)bmpa32b.dev : $(DEVS_MAK) $(bmpa_)
$(GLD)page.dev $(GLD)async.dev\
-
- xcf_=$(DEVOBJ)gdevxcf.$(OBJ)
-
--$(DD)xcf.dev : $(DEVS_MAK) $(xcf_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)xcf.dev : $(xcf_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)xcf $(xcf_)
-
--$(DD)xcfcmyk.dev : $(DEVS_MAK) $(xcf_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)xcfcmyk.dev : $(xcf_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)xcfcmyk $(xcf_)
-
- $(DEVOBJ)gdevxcf.$(OBJ) : $(DEVSRC)gdevxcf.c $(PDEVH) $(math__h)\
- $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
- $(gxdcconv_h) $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevxcf.$(OBJ) $(C_) $(DEVSRC)gdevxcf.c
-
- ### --------------------------- The PSD device ------------------------- ###
-
- psd_=$(DEVOBJ)gdevpsd.$(OBJ) $(GLOBJ)gdevdevn.$(OBJ) $(GLOBJ)gsequivc.$(OBJ)
-+gdevpsd_h=$(DEVSRC)gdevpsd.h
-
--$(DD)psdrgb.dev : $(DEVS_MAK) $(psd_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)psdrgb.dev : $(psd_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)psdrgb $(psd_)
-
--$(DD)psdcmyk.dev : $(DEVS_MAK) $(psd_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)psdcmyk.dev : $(psd_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)psdcmyk $(psd_)
-
- $(DEVOBJ)gdevpsd.$(OBJ) : $(DEVSRC)gdevpsd.c $(PDEVH) $(math__h)\
- $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
- $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h)\
- $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\
-- $(gdevppla_h) $(MAKEDIRS)
-+ $(gdevppla_h) $(gxiodev_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsd.$(OBJ) $(C_) $(DEVSRC)gdevpsd.c
-
- ### --------------------------- The GPRF device -------------------------
###
-
- gprf_=$(DEVOBJ)gdevgprf.$(OBJ) $(GLOBJ)gdevdevn.$(OBJ)
$(GLOBJ)gsequivc.$(OBJ) $(DEVOBJ)gdevppla.$(OBJ)
-
--$(DD)gprf.dev : $(DEVS_MAK) $(gprf_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)gprf.dev : $(gprf_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV) $(DD)gprf $(gprf_)
-
--$(DEVOBJ)gdevgprf.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\
-+$(DEVOBJ)gdevgprf_1.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\
-+ $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
-+ $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) \
-+ $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\
-+ $(gdevppla_h) $(DEVS_MAK) $(MAKEDIRS)
-+ $(DEVCC) $(DEVO_)gdevgprf_1.$(OBJ) $(II)$(ZI_)$(_I) $(C_)
$(DEVSRC)gdevgprf.c
-+
-+$(DEVOBJ)gdevgprf_0.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\
- $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
- $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) $(zlib_h)\
- $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\
-- $(gdevppla_h) $(MAKEDIRS)
-- $(DEVCC) $(DEVO_)gdevgprf.$(OBJ) $(II)$(ZI_)$(_I) $(C_)
$(DEVSRC)gdevgprf.c
-+ $(gdevppla_h) $(DEVS_MAK) $(MAKEDIRS)
-+ $(DEVCC) $(DEVO_)gdevgprf_0.$(OBJ) $(II)$(ZI_)$(_I) $(C_)
$(DEVSRC)gdevgprf.c
-+
-+$(DEVOBJ)gdevgprf.$(OBJ) : $(DEVOBJ)gdevgprf_$(SHARE_ZLIB).$(OBJ)
$(DEVS_MAK) $(MAKEDIRS)
-+ $(CP_) $(DEVOBJ)gdevgprf_$(SHARE_ZLIB).$(OBJ) $(DEVOBJ)gdevgprf.$(OBJ)
-
- ### ----------------------- The permutation device --------------------- ###
-
- perm_=$(DEVOBJ)gdevperm.$(OBJ)
-
--$(DD)perm.dev : $(DEVS_MAK) $(perm_) $(GLD)page.dev $(GDEV)
-+$(DD)perm.dev : $(perm_) $(GLD)page.dev $(GDEV)
- $(SETDEV) $(DD)perm $(perm_)
-
- $(DEVOBJ)gdevperm.$(OBJ) : $(DEVSRC)gdevperm.c $(PDEVH) $(math__h)\
-- $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h) $(MAKEDIRS)
-+ $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevperm.$(OBJ) $(C_) $(DEVSRC)gdevperm.c
-
- ### ------------------------ JBIG2 testing device ---------------------- ###
-
- gdevjbig2_=$(DEVOBJ)gdevjbig2.$(OBJ)
-
--$(DD)gdevjbig2.dev : $(DEVS_MAK) $(gdevjbig2_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)gdevjbig2.dev : $(gdevjbig2_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)gdevjbig2 $(gdevjbig2_)
-
- $(DEVOBJ)gdevjbig2.$(OBJ) : $(DEVSRC)gdevjbig2.c $(PDEVH)\
-- $(stream_h) $(strimpl_h) $(sjbig2_luratech_h) $(MAKEDIRS)
-+ $(stream_h) $(strimpl_h) $(sjbig2_luratech_h) $(DEVS_MAK) $(MAKEDIRS)
- $(GDEVLDFJB2CC) $(DEVO_)gdevjbig2.$(OBJ) $(C_) $(DEVSRC)gdevjbig2.c
-
- ### ------------------------ JPX testing device ----------------------
-@@ -1432,20 +1453,20 @@ $(DEVOBJ)gdevjbig2.$(OBJ) : $(DEVSRC)gdevjbig2.c
$(PDEVH)\
-
- gdevjpx_=$(DEVOBJ)gdevjpx.$(OBJ)
-
--$(DD)jpxrgb.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)jpxrgb.dev : $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpxrgb $(gdevjpx_)
-
--$(DD)jpxgray.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)jpxgray.dev : $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpxgray $(gdevjpx_)
-
--$(DD)jpxcmyk.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)jpxcmyk.dev : $(gdevjpx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpxcmyk $(gdevjpx_)
-
- $(DEVOBJ)gdevjpx.$(OBJ) : $(DEVSRC)gdevjpx.c $(PDEVH)\
-- $(stream_h) $(strimpl_h) $(sjpx_luratech_h) $(MAKEDIRS)
-+ $(stream_h) $(strimpl_h) $(sjpx_luratech_h) $(DEVS_MAK) $(MAKEDIRS)
- $(GDEVLWFJPXCC) $(DEVO_)gdevjpx.$(OBJ) $(C_) $(DEVSRC)gdevjpx.c
-
- ### ------------------------- JPEG file format ------------------------- ###
-@@ -1453,26 +1474,26 @@ $(DEVOBJ)gdevjpx.$(OBJ) : $(DEVSRC)gdevjpx.c
$(PDEVH)\
- jpeg_=$(DEVOBJ)gdevjpeg.$(OBJ)
-
- # RGB output
--$(DD)jpeg.dev : $(DEVS_MAK) $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev $(GDEV)
\
-- $(MAKEDIRS)
-+$(DD)jpeg.dev : $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpeg $(jpeg_)
- $(ADDMOD) $(DD)jpeg -include $(GLD)sdcte
-
- # Gray output
--$(DD)jpeggray.dev : $(DEVS_MAK) $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)jpeggray.dev : $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpeggray $(jpeg_)
- $(ADDMOD) $(DD)jpeggray -include $(GLD)sdcte
-
- # CMYK output
--$(DD)jpegcmyk.dev : $(DEVS_MAK) $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)jpegcmyk.dev : $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)jpegcmyk $(jpeg_)
- $(ADDMOD) $(DD)jpegcmyk -include $(GLD)sdcte
-
- $(DEVOBJ)gdevjpeg.$(OBJ) : $(DEVSRC)gdevjpeg.c $(PDEVH)\
- $(stdio__h) $(jpeglib__h)\
-- $(sdct_h) $(sjpeg_h) $(stream_h) $(strimpl_h) $(MAKEDIRS)
-+ $(sdct_h) $(sjpeg_h) $(stream_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevjpeg.$(OBJ) $(C_) $(DEVSRC)gdevjpeg.c
-
- ### ------------------------- MIFF file format ------------------------- ###
-@@ -1481,10 +1502,10 @@ $(DEVOBJ)gdevjpeg.$(OBJ) : $(DEVSRC)gdevjpeg.c
$(PDEVH)\
-
- miff_=$(DEVOBJ)gdevmiff.$(OBJ)
-
--$(DD)miff24.dev : $(DEVS_MAK) $(miff_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)miff24.dev : $(miff_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV) $(DD)miff24 $(miff_)
-
--$(DEVOBJ)gdevmiff.$(OBJ) : $(DEVSRC)gdevmiff.c $(PDEVH) $(MAKEDIRS)
-+$(DEVOBJ)gdevmiff.$(OBJ) : $(DEVSRC)gdevmiff.c $(PDEVH) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevmiff.$(OBJ) $(C_) $(DEVSRC)gdevmiff.c
-
- ### ------------------------- PCX file formats ------------------------- ###
-@@ -1492,42 +1513,42 @@ $(DEVOBJ)gdevmiff.$(OBJ) : $(DEVSRC)gdevmiff.c
$(PDEVH) $(MAKEDIRS)
- pcx_=$(DEVOBJ)gdevpcx.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-
- $(DEVOBJ)gdevpcx.$(OBJ) : $(DEVSRC)gdevpcx.c $(PDEVH) $(gdevpccm_h)
$(gxlum_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpcx.$(OBJ) $(C_) $(DEVSRC)gdevpcx.c
-
--$(DD)pcxmono.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcxmono.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcxmono $(pcx_)
-
--$(DD)pcxgray.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcxgray.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcxgray $(pcx_)
-
--$(DD)pcx16.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcx16.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcx16 $(pcx_)
-
--$(DD)pcx256.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcx256.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcx256 $(pcx_)
-
--$(DD)pcx24b.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcx24b.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcx24b $(pcx_)
-
--$(DD)pcxcmyk.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pcxcmyk.dev : $(pcx_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pcxcmyk $(pcx_)
-
- # The 2-up PCX device is here only as an example, and for testing.
-
--$(DD)pcx2up.dev : $(DEVS_MAK) $(LIB_MAK) $(DEVOBJ)gdevp2up.$(OBJ)\
-- $(GLD)page.dev $(DD)pcx256.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pcx2up.dev : $(LIB_MAK) $(DEVOBJ)gdevp2up.$(OBJ)\
-+ $(GLD)page.dev $(DD)pcx256.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV) $(DD)pcx2up $(DEVOBJ)gdevp2up.$(OBJ)
- $(ADDMOD) $(DD)pcx2up -include $(DD)pcx256
-
- $(DEVOBJ)gdevp2up.$(OBJ) : $(DEVSRC)gdevp2up.c $(AK)\
-- $(gdevpccm_h) $(gdevprn_h) $(gxclpage_h) $(MAKEDIRS)
-+ $(gdevpccm_h) $(gdevprn_h) $(gxclpage_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevp2up.$(OBJ) $(C_) $(DEVSRC)gdevp2up.c
-
- ### ------------------- Portable Bitmap file formats ------------------- ###
-@@ -1539,98 +1560,98 @@ pxm_=$(DEVOBJ)gdevpbm.$(OBJ) $(GLOBJ)gdevppla.$(OBJ)
$(GLOBJ)gdevmpla.$(OBJ)
- $(DEVOBJ)gdevpbm.$(OBJ) : $(DEVSRC)gdevpbm.c $(PDEVH)\
- $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
- $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpbm.$(OBJ) $(C_) $(DEVSRC)gdevpbm.c
-
- ### Portable Bitmap (PBM, plain or raw format, magic numbers "P1" or "P4")
-
--$(DD)pbm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pbm.dev : $(pxm_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pbm $(pxm_)
-
--$(DD)pbmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pbmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pbmraw $(pxm_)
-
- ### Portable Graymap (PGM, plain or raw format, magic numbers "P2" or "P5")
-
--$(DD)pgm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pgm.dev : $(pxm_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pgm $(pxm_)
-
--$(DD)pgmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pgmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pgmraw $(pxm_)
-
- # PGM with automatic optimization to PBM if this is possible.
-
--$(DD)pgnm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pgnm.dev : $(pxm_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pgnm $(pxm_)
-
--$(DD)pgnmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pgnmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pgnmraw $(pxm_)
-
- ### Portable Pixmap (PPM, plain or raw format, magic numbers "P3" or "P6")
-
--$(DD)ppm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)ppm.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ppm $(pxm_)
-
--$(DD)ppmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)ppmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)ppmraw $(pxm_)
-
- # PPM with automatic optimization to PGM or PBM if possible.
-
--$(DD)pnm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pnm.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pnm $(pxm_)
-
--$(DD)pnmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pnmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pnmraw $(pxm_)
-
--$(DD)pnmcmyk.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pnmcmyk.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pnmcmyk $(pxm_)
-
- ### Portable inKmap (CMYK internally, converted to PPM=RGB at output time)
-
--$(DD)pkm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pkm.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pkm $(pxm_)
-
--$(DD)pkmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pkmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pkmraw $(pxm_)
-
- ### Portable Separated map (CMYK internally, produces 4 monobit pages)
-
--$(DD)pksm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pksm.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pksm $(pxm_)
-
--$(DD)pksmraw.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pksmraw.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pksmraw $(pxm_)
-
- ### Plan 9 bitmap format
-
--$(DD)plan9bm.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)plan9bm.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plan9bm $(pxm_)
-
- ### Portable Arbitrary Map (PAM, magic number "P7", CMYK)
-
--$(DD)pamcmyk4.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pamcmyk4.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pamcmyk4 $(pxm_)
-
--$(DD)pamcmyk32.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pamcmyk32.dev : $(pxm_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pamcmyk32 $(pxm_)
-
- # Keep the older (non-descriptive) name in case it is being used
--$(DD)pam.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)pam.dev : $(pxm_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pam $(pxm_)
-
- ### --------------- Portable Network Graphics file format ---------------
###
-@@ -1642,46 +1663,46 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev
- png_i_=-include $(PNGGENDIR)$(D)libpng
-
- $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\
-- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) $(MAKEDIRS)
-+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) $(DEVS_MAK) $(MAKEDIRS)
- $(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_)
$(DEVO_)gdevpng.$(OBJ) $(C_) $(DEVSRC)gdevpng.c
-
--$(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
\
-- $(MAKEDIRS)
-+$(DD)pngmono.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pngmono $(png_)
- $(ADDMOD) $(DD)pngmono $(png_i_)
-
--$(DD)pngmonod.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev
$(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pngmonod.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pngmonod $(png_)
- $(ADDMOD) $(DD)pngmonod $(png_i_)
-
--$(DD)pnggray.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
\
-- $(MAKEDIRS)
-+$(DD)pnggray.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pnggray $(png_)
- $(ADDMOD) $(DD)pnggray $(png_i_)
-
--$(DD)png16.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)png16.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)png16 $(png_)
- $(ADDMOD) $(DD)png16 $(png_i_)
-
--$(DD)png256.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)png256.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)png256 $(png_)
- $(ADDMOD) $(DD)png256 $(png_i_)
-
--$(DD)png16m.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)png16m.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)png16m $(png_)
- $(ADDMOD) $(DD)png16m $(png_i_)
-
--$(DD)png48.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)png48.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)png48 $(png_)
- $(ADDMOD) $(DD)png48 $(png_i_)
-
--$(DD)pngalpha.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev
$(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pngalpha.dev : $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pngalpha $(png_)
- $(ADDMOD) $(DD)pngalpha $(png_i_)
-
-@@ -1692,17 +1713,17 @@ $(DD)pngalpha.dev : $(DEVS_MAK) $(libpng_dev)
$(png_) $(GLD)page.dev $(GDEV) \
- fpng_=$(DEVOBJ)gdevfpng.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-
- $(DEVOBJ)gdevfpng_0.$(OBJ) : $(DEVSRC)gdevfpng.c\
-- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(zlib_h) $(MAKEDIRS)
-+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(zlib_h) $(DEVS_MAK) $(MAKEDIRS)
- $(CC_) $(I_)$(DEVI_) $(II)$(ZI_)$(_I) $(PCF_) $(GLF_)
$(DEVO_)gdevfpng_0.$(OBJ) $(C_) $(DEVSRC)gdevfpng.c
-
- $(DEVOBJ)gdevfpng_1.$(OBJ) : $(DEVSRC)gdevfpng.c\
-- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(MAKEDIRS)
-+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(DEVS_MAK) $(MAKEDIRS)
- $(CC_) $(I_)$(DEVI_) $(II)$(ZI_)$(_I) $(PCF_) $(GLF_)
$(DEVO_)gdevfpng_1.$(OBJ) $(C_) $(DEVSRC)gdevfpng.c
-
--$(DEVOBJ)gdevfpng.$(OBJ) : $(DEVOBJ)gdevfpng_$(SHARE_ZLIB).$(OBJ)
$(MAKEDIRS)
-+$(DEVOBJ)gdevfpng.$(OBJ) : $(DEVOBJ)gdevfpng_$(SHARE_ZLIB).$(OBJ)
$(DEVS_MAK) $(MAKEDIRS)
- $(CP_) $(DEVOBJ)gdevfpng_$(SHARE_ZLIB).$(OBJ) $(DEVOBJ)gdevfpng.$(OBJ)
-
--$(DD)fpng.dev : $(DEVS_MAK) $(fpng_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)fpng.dev : $(fpng_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)fpng $(fpng_)
- $(ADDMOD) $(DD)fpng $(fpng_i_)
-
-@@ -1716,7 +1737,7 @@ psim_=$(DEVOBJ)gdevpsim.$(OBJ) $(DEVOBJ)gdevpsu.$(OBJ)
-
- $(DEVOBJ)gdevpsim.$(OBJ) : $(DEVSRC)gdevpsim.c $(PDEVH)\
- $(gdevpsu_h)\
-- $(sa85x_h) $(srlx_h) $(stream_h) $(strimpl_h) $(MAKEDIRS)
-+ $(sa85x_h) $(srlx_h) $(stream_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevpsim.$(OBJ) $(C_) $(DEVSRC)gdevpsim.c
-
- ### --- Minimum Feature Size support functions --- ###
-@@ -1728,7 +1749,7 @@ $(DEVOBJ)gdevpsim.$(OBJ) : $(DEVSRC)gdevpsim.c
$(PDEVH)\
- minftrsz_h=$(DEVSRC)minftrsz.h $(std_h)
- minftrsz_=$(minftrsz_h) $(DEVOBJ)minftrsz.$(OBJ)
-
--$(DEVOBJ)minftrsz.$(OBJ) : $(DEVSRC)minftrsz.c $(minftrsz_h) $(MAKEDIRS)
-+$(DEVOBJ)minftrsz.$(OBJ) : $(DEVSRC)minftrsz.c $(minftrsz_h) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(DEVO_)minftrsz.$(OBJ) $(C_) $(DEVSRC)minftrsz.c
-
-
-@@ -1742,27 +1763,27 @@ $(DEVOBJ)minftrsz.$(OBJ) : $(DEVSRC)minftrsz.c
$(minftrsz_h) $(MAKEDIRS)
- gdevfax_h=$(DEVSRC)gdevfax.h
-
- fax_=$(DEVOBJ)gdevfax.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
--$(DD)fax.dev : $(DEVS_MAK) $(libtiff_dev) $(fax_) $(GLD)cfe.dev
$(minftrsz_h)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)fax.dev : $(libtiff_dev) $(fax_) $(GLD)cfe.dev $(minftrsz_h)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)fax $(fax_)
- $(ADDMOD) $(DD)fax -include $(GLD)cfe $(tiff_i_)
-
- $(DEVOBJ)gdevfax.$(OBJ) : $(DEVSRC)gdevfax.c $(PDEVH)\
-- $(gdevfax_h) $(scfx_h) $(strimpl_h) $(MAKEDIRS)
-+ $(gdevfax_h) $(scfx_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevfax.$(OBJ) $(C_) $(DEVSRC)gdevfax.c
-
--$(DD)faxg3.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)faxg3.dev : $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)faxg3 -include $(DD)fax
- $(ADDMOD) $(DD)faxg3 $(tiff_i_)
-
--$(DD)faxg32d.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)faxg32d.dev : $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)faxg32d -include $(DD)fax
- $(ADDMOD) $(DD)faxg32d $(tiff_i_)
-
--$(DD)faxg4.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)faxg4.dev : $(libtiff_dev) $(DD)fax.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)faxg4 -include $(DD)fax
- $(ADDMOD) $(DD)faxg4 $(tiff_i_)
-
-@@ -1774,16 +1795,16 @@ $(DD)faxg4.dev : $(DEVS_MAK) $(libtiff_dev)
$(DD)fax.dev $(GDEV) \
- gdevtifs_h=$(DEVSRC)gdevtifs.h
-
- tfax_=$(DEVOBJ)gdevtfax.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
--$(DD)tfax.dev : $(DEVS_MAK) $(libtiff_dev) $(tfax_) $(GLD)cfe.dev\
-+$(DD)tfax.dev : $(libtiff_dev) $(tfax_) $(GLD)cfe.dev\
- $(GLD)lzwe.dev $(GLD)rle.dev $(DD)fax.dev $(DD)tiffs.dev $(minftrsz_h)\
-- $(gstiffio_h) $(GDEV) $(MAKEDIRS)
-+ $(gstiffio_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)tfax $(tfax_)
- $(ADDMOD) $(DD)tfax -include $(GLD)cfe $(GLD)lzwe $(GLD)rle
- $(ADDMOD) $(DD)tfax -include $(DD)fax $(DD)tiffs $(tiff_i_)
-
- $(DEVOBJ)gdevtfax.$(OBJ) : $(DEVSRC)gdevtfax.c $(PDEVH)\
- $(stdint__h) $(gdevfax_h) $(gdevtifs_h)\
-- $(scfx_h) $(slzwx_h) $(srlx_h) $(strimpl_h) $(MAKEDIRS)
-+ $(scfx_h) $(slzwx_h) $(srlx_h) $(strimpl_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtfax.$(OBJ) $(C_)
$(DEVSRC)gdevtfax.c
-
- ### ---------------------------- TIFF formats ---------------------------
###
-@@ -1795,70 +1816,70 @@ tiffgray_=$(DEVOBJ)gdevtsep.$(OBJ)
$(GLOBJ)gsequivc.$(OBJ) $(DEVOBJ)minftrsz.$(O
- tiffsep_=$(tiffgray_) $(GLOBJ)gdevdevn.$(OBJ) $(GLOBJ)gsequivc.$(OBJ) \
- $(GLOBJ)gdevppla.$(OBJ)
-
--$(DD)tiffs.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffs_) $(GLD)page.dev\
-- $(minftrsz_) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffs.dev : $(libtiff_dev) $(tiffs_) $(GLD)page.dev\
-+ $(minftrsz_) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)tiffs $(tiffs_)
- $(ADDMOD) $(DD)tiffs -include $(GLD)page $(tiff_i_)
-
- $(DEVOBJ)gdevtifs.$(OBJ) : $(DEVSRC)gdevtifs.c $(PDEVH) $(stdint__h)
$(stdio__h) $(time__h)\
-- $(gdevtifs_h) $(gscdefs_h) $(gstypes_h) $(stream_h) $(strmio_h)
$(gstiffio_h) $(MAKEDIRS)
-+ $(gdevtifs_h) $(gscdefs_h) $(gstypes_h) $(stream_h) $(strmio_h)
$(gstiffio_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(I_)$(DEVI_) $(II)$(TI_)$(_I) $(DEVO_)gdevtifs.$(OBJ) $(C_)
$(DEVSRC)gdevtifs.c
-
- # Black & white, G3/G4 fax
- # NOTE: see under faxg* above regarding page width adjustment.
-
--$(DD)tiffcrle.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffcrle.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tiffcrle -include $(DD)tfax
- $(ADDMOD) $(DD)tiffcrle $(tiff_i_)
-
--$(DD)tiffg3.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffg3.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tiffg3 -include $(DD)tfax
- $(ADDMOD) $(DD)tiffg3 $(tiff_i_)
-
--$(DD)tiffg32d.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffg32d.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tiffg32d -include $(DD)tfax
- $(ADDMOD) $(DD)tiffg32d $(tiff_i_)
-
--$(DD)tiffg4.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffg4.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tiffg4 -include $(DD)tfax
- $(ADDMOD) $(DD)tiffg4 $(tiff_i_)
-
- # Black & white, LZW compression
-
--$(DD)tifflzw.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tifflzw.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tifflzw -include $(DD)tfax
- $(ADDMOD) $(DD)tifflzw $(tiff_i_)
-
- # Black & white, PackBits compression
-
--$(DD)tiffpack.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffpack.dev : $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)tiffpack -include $(DD)tfax
- $(ADDMOD) $(DD)tiffpack $(tiff_i_)
-
- # TIFF Gray, no compression
-
--$(DD)tiffgray.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffgray.dev : $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffgray $(tiffgray_)
- $(ADDMOD) $(DD)tiffgray -include $(DD)tiffs $(tiff_i_)
-
- $(DEVOBJ)gdevtsep.$(OBJ) : $(DEVSRC)gdevtsep.c $(PDEVH) $(stdint__h)\
- $(gdevtifs_h) $(gdevdevn_h) $(gsequivc_h) $(stdio__h) $(ctype__h)\
-- $(gxgetbit_h) $(gdevppla_h) $(gp_h) $(gstiffio_h) $(GDEV) $(MAKEDIRS)
-+ $(gxgetbit_h) $(gdevppla_h) $(gp_h) $(gstiffio_h) $(GDEV) $(DEVS_MAK)
$(MAKEDIRS)
- $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtsep.$(OBJ) $(C_)
$(DEVSRC)gdevtsep.c
-
- # TIFF Scaled (downscaled gray -> mono), configurable compression
-
- tiffscaled_=$(tiffsep_)
-
--$(DD)tiffscaled.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled_)
$(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffscaled.dev : $(libtiff_dev) $(tiffscaled_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffscaled $(tiffscaled_)
- $(ADDMOD) $(DD)tiffscaled -include $(DD)tiffs $(tiff_i_)
-
-@@ -1866,8 +1887,8 @@ $(DD)tiffscaled.dev : $(DEVS_MAK) $(libtiff_dev)
$(tiffscaled_) $(DD)tiffs.dev\
-
- tiffscaled8_=$(tiffseop_)
-
--$(DD)tiffscaled8.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled8_)\
-- $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffscaled8.dev : $(libtiff_dev) $(tiffscaled8_)\
-+ $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffscaled8 $(tiffscaled8_)
- $(ADDMOD) $(DD)tiffscaled8 -include $(DD)tiffs $(tiff_i_)
-
-@@ -1875,8 +1896,8 @@ $(DD)tiffscaled8.dev : $(DEVS_MAK) $(libtiff_dev)
$(tiffscaled8_)\
-
- tiffscaled24_=$(tiffsep_)
-
--$(DD)tiffscaled24.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled24_)\
-- $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffscaled24.dev : $(libtiff_dev) $(tiffscaled24_)\
-+ $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffscaled24 $(tiffscaled8_)
- $(ADDMOD) $(DD)tiffscaled24 -include $(DD)tiffs $(tiff_i_)
-
-@@ -1884,8 +1905,8 @@ $(DD)tiffscaled24.dev : $(DEVS_MAK) $(libtiff_dev)
$(tiffscaled24_)\
-
- tiffscaled32_=$(tiffsep_)
-
--$(DD)tiffscaled32.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled32_)\
-- $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffscaled32.dev : $(libtiff_dev) $(tiffscaled32_)\
-+ $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffscaled32 $(tiffscaled8_)
- $(ADDMOD) $(DD)tiffscaled32 -include $(DD)tiffs $(tiff_i_)
-
-@@ -1893,8 +1914,8 @@ $(DD)tiffscaled32.dev : $(DEVS_MAK) $(libtiff_dev)
$(tiffscaled32_)\
-
- tiffscaled4_=$(tiffsep_)
-
--$(DD)tiffscaled4.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled4_)\
-- $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffscaled4.dev : $(libtiff_dev) $(tiffscaled4_)\
-+ $(DD)tiffs.dev $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffscaled4 $(tiffscaled8_)
- $(ADDMOD) $(DD)tiffscaled4 -include $(DD)tiffs $(tiff_i_)
-
-@@ -1902,50 +1923,50 @@ $(DD)tiffscaled4.dev : $(DEVS_MAK) $(libtiff_dev)
$(tiffscaled4_)\
-
- tiffrgb_=$(DEVOBJ)gdevtfnx.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
-
--$(DD)tiff12nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiff12nc.dev : $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiff12nc $(tiffrgb_)
- $(ADDMOD) $(DD)tiff12nc -include $(DD)tiffs $(tiff_i_)
-
--$(DD)tiff24nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiff24nc.dev : $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiff24nc $(tiffrgb_)
- $(ADDMOD) $(DD)tiff24nc -include $(DD)tiffs $(tiff_i_)
-
--$(DD)tiff48nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiff48nc.dev : $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiff48nc $(tiffrgb_)
- $(ADDMOD) $(DD)tiff48nc -include $(DD)tiffs $(tiff_i_)
-
- $(DEVOBJ)gdevtfnx.$(OBJ) : $(DEVSRC)gdevtfnx.c $(PDEVH) $(stdint__h)\
-- $(gdevtifs_h) $(gscms_h) $(gstiffio_h) $(GDEV) $(MAKEDIRS)
-+ $(gdevtifs_h) $(gscms_h) $(gstiffio_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtfnx.$(OBJ) $(C_)
$(DEVSRC)gdevtfnx.c
-
- # TIFF CMYK, no compression
-
--$(DD)tiff32nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiff32nc.dev : $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiff32nc $(tiffgray_)
- $(ADDMOD) $(DD)tiff32nc -include $(DD)tiffs $(tiff_i_)
-
--$(DD)tiff64nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiff64nc.dev : $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiff64nc $(tiffgray_)
- $(ADDMOD) $(DD)tiff64nc -include $(DD)tiffs $(tiff_i_)
-
- #
- # Create separation files (tiffgray) plus CMYK composite (tiff32nc)
-
--$(DD)tiffsep.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffsep_) $(DD)tiffs.dev\
-- $(minftrsz_h) $(GDEV) $(MAKEDIRS)
-+$(DD)tiffsep.dev : $(libtiff_dev) $(tiffsep_) $(DD)tiffs.dev\
-+ $(minftrsz_h) $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffsep $(tiffsep_)
- $(ADDMOD) $(DD)tiffsep -include $(DD)tiffs $(tiff_i_)
-
- #
- # Create separation files (tiff 1-bit)
-
--$(DD)tiffsep1.dev : $(DEVS_MAK) $(tiffsep_) $(DD)tiffs.dev $(minftrsz_h)\
-- $(GDEV) $(MAKEDIRS)
-+$(DD)tiffsep1.dev : $(tiffsep_) $(DD)tiffs.dev $(minftrsz_h)\
-+ $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)tiffsep1 $(tiffsep_)
- $(ADDMOD) $(DD)tiffsep1 -include $(DD)tiffs
-
-@@ -1957,27 +1978,27 @@ plan_=$(DEVOBJ)gdevplan.$(OBJ)
$(DEVOBJ)gdevppla.$(OBJ) $(DEVOBJ)gdevmpla.$(OBJ)
- $(DEVOBJ)gdevplan.$(OBJ) : $(DEVSRC)gdevplan.c $(PDEVH)\
- $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
- $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevplan.$(OBJ) $(C_) $(DEVSRC)gdevplan.c
-
--$(DD)plan.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)plan.dev : $(plan_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plan $(plan_)
-
--$(DD)plang.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)plang.dev : $(plan_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plang $(plan_)
-
--$(DD)planm.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)planm.dev : $(plan_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)planm $(plan_)
-
--$(DD)planc.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)planc.dev : $(plan_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)planc $(plan_)
-
--$(DD)plank.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)plank.dev : $(plan_) $(GLD)page.dev $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plank $(plan_)
-
- #
-@@ -1988,36 +2009,36 @@ plib_=$(DEVOBJ)gdevplib.$(OBJ)
$(GLOBJ)gdevppla.$(OBJ) $(GLOBJ)gdevmpla.$(OBJ)
- $(DEVOBJ)gdevplib.$(OBJ) : $(DEVSRC)gdevplib.c $(PDEVH)\
- $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
- $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevplib.$(OBJ) $(C_) $(DEVSRC)gdevplib.c
-
--$(DD)plib.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)plib.dev : $(plib_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plib $(plib_)
-
--$(DD)plibg.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)plibg.dev : $(plib_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plibg $(plib_)
-
--$(DD)plibm.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)plibm.dev : $(plib_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plibm $(plib_)
-
--$(DD)plibc.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)plibc.dev : $(plib_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plibc $(plib_)
-
--$(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV) $(MAKEDIRS)
-+$(DD)plibk.dev : $(plib_) $(GLD)page.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)plibk $(plib_)
-
- # ink coverage device -- a device that records the ink coverage
- # on each page, and discards the page.
- $(DD)inkcov.dev : $(ECHOGS_XE) $(LIB_MAK) $(DEVOBJ)gdevicov.$(OBJ) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)inkcov $(DEVOBJ)gdevicov.$(OBJ)
-
- $(DD)ink_cov.dev : $(ECHOGS_XE) $(LIB_MAK) $(DEVOBJ)gdevicov.$(OBJ) \
-- $(MAKEDIRS)
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETDEV2) $(DD)ink_cov $(DEVOBJ)gdevicov.$(OBJ)
-
- $(DEVOBJ)gdevicov.$(OBJ) : $(DEVSRC)gdevicov.c $(AK) \
-- $(arch_h) $(gdevprn_h) $(stdio__h) $(stdint__h) $(MAKEDIRS)
-+ $(arch_h) $(gdevprn_h) $(stdio__h) $(stdint__h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevicov.$(OBJ) $(C_) $(DEVSRC)gdevicov.c
-
-
-@@ -2026,18 +2047,18 @@ lcups_dev=$(LCUPSGENDIR)$(D)lcups.dev
- lcupsi_dev=$(LCUPSIGENDIR)$(D)lcupsi.dev
-
- cups_=$(DEVOBJ)gdevcups.$(OBJ)
--$(DD)cups.dev : $(DEVS_MAK) $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV) \
-- $(MAKEDIRS)
-+$(DD)cups.dev : $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)cups $(cups_)
- $(ADDMOD) $(DD)cups -include $(lcups_dev)
- $(ADDMOD) $(DD)cups -include $(lcupsi_dev)
--$(DD)pwgraster.dev : $(DEVS_MAK) $(lcups_dev) $(lcupsi_dev) $(cups_)
$(GDEV) \
-- $(MAKEDIRS)
-+$(DD)pwgraster.dev : $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV2) $(DD)pwgraster $(cups_)
- $(ADDMOD) $(DD)pwgraster -include $(lcups_dev)
- $(ADDMOD) $(DD)pwgraster -include $(lcupsi_dev)
-
--$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(MAKEDIRS)
-+$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h)
$(DEVS_MAK) $(MAKEDIRS)
- $(CUPS_CC) $(DEVO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(CUPSCFLAGS) \
- $(I_)$(GLSRC) \
- $(I_)$(DEVSRC) \
-@@ -2051,11 +2072,11 @@ $(DEVOBJ)gdevcups.$(OBJ) :
$(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(MAKEDIRS)
- $(DEVOBJ)gdevtrac.$(OBJ) : $(DEVSRC)gdevtrac.c $(AK) $(gx_h)\
- $(gserrors_h) $(gscspace_h)\
- $(gxdevice_h) $(gxdht_h) $(gxfont_h) $(gxiparam_h) $(gxistate_h)\
-- $(gxpaint_h) $(gxtmap_h) $(gzcpath_h) $(gzpath_h) $(MAKEDIRS)
-+ $(gxpaint_h) $(gxtmap_h) $(gzcpath_h) $(gzpath_h) $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevtrac.$(OBJ) $(C_) $(DEVSRC)gdevtrac.c
-
--$(DD)tracedev.dev : $(DEVS_MAK) $(GDEV) $(DEVOBJ)gdevtrac.$(OBJ) \
-- $(MAKEDIRS)
-+$(DD)tracedev.dev : $(GDEV) $(DEVOBJ)gdevtrac.$(OBJ) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(SETMOD) $(DD)tracedev -dev2 tr_mono tr_rgb tr_cmyk
- $(ADDMOD) $(DD)tracedev -obj $(DEVOBJ)gdevtrac.$(OBJ)
-
-@@ -2063,10 +2084,11 @@ $(DD)tracedev.dev : $(DEVS_MAK) $(GDEV)
$(DEVOBJ)gdevtrac.$(OBJ) \
-
- psdcmykog_=$(DEVOBJ)gdevcmykog.$(OBJ)
-
--$(DD)psdcmykog.dev : $(DEVS_MAK) $(GDEV) $(psdcmykog_) $(DD)page.dev \
-- $(GLOBJ)gdevdevn.$(OBJ) $(MAKEDIRS)
-+$(DD)psdcmykog.dev : $(GDEV) $(psdcmykog_) $(DD)page.dev $(DD)psdcmyk.dev \
-+ $(GLOBJ)gdevdevn.$(OBJ) $(DEVS_MAK) $(MAKEDIRS)
- $(SETPDEV) $(DD)psdcmykog $(psdcmykog_)
-
- $(DEVOBJ)gdevcmykog.$(OBJ) : $(DEVSRC)gdevcmykog.c $(GDEV) \
-- $(GDEVH) $(gdevdevn_h) $(gsequivc_h) $(gdevdevnprn_h) $(MAKEDIRS)
-+ $(GDEVH) $(gdevdevn_h) $(gsequivc_h) $(gdevdevnprn_h) \
-+ $(DEVS_MAK) $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevcmykog.$(OBJ) $(C_) $(DEVSRC)gdevcmykog.c
diff --git a/qt5-deprecated/qtwebkit/CONFLICTS
b/qt5-deprecated/qtwebkit/CONFLICTS
new file mode 100755
index 0000000..38420f6
--- /dev/null
+++ b/qt5-deprecated/qtwebkit/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtwebkit y
diff --git a/qt5-deprecated/qtwebkit/DEPENDS b/qt5-deprecated/qtwebkit/DEPENDS
index 62f5789..394dd46 100755
--- a/qt5-deprecated/qtwebkit/DEPENDS
+++ b/qt5-deprecated/qtwebkit/DEPENDS
@@ -1,4 +1,3 @@
-depends -sub CXX gcc &&
depends perl &&
depends bison &&
depends flex &&
@@ -18,4 +17,7 @@ depends fontconfig &&
optional_depends DEVICE-MANAGER '' '' 'hardware detection' &&
optional_depends qtsensors '' '' 'device orientation/motion features' &&
optional_depends qtdeclarative '' '' 'QML support' &&
-optional_depends qtmultimedia '' '' 'multimedias support'
+optional_depends qtlocation '' '' 'geolocation support' &&
+optional_depends qtmultimedia '' '' 'multimedia support' &&
+optional_depends qtwebchannel '' '' 'webchannel support'
+
diff --git a/qt5-deprecated/qtwebkit/HISTORY b/qt5-deprecated/qtwebkit/HISTORY
index 31e7823..84e6715 100644
--- a/qt5-deprecated/qtwebkit/HISTORY
+++ b/qt5-deprecated/qtwebkit/HISTORY
@@ -1,3 +1,7 @@
+2016-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional qtwebchannel, qtlocation
+ * CONFLICTS: added
+
2015-10-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.1
diff --git a/qt5-deprecated/qtwebkit/pthread.diff
b/qt5-deprecated/qtwebkit/pthread.diff
new file mode 100644
index 0000000..ad19e7e
--- /dev/null
+++ b/qt5-deprecated/qtwebkit/pthread.diff
@@ -0,0 +1,14 @@
+diff --git a/Tools/qmake/mkspecs/features/default_post.prf
+b/Tools/qmake/mkspecs/features/default_post.prf
+index 67276b7..39bb3f7 100644
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -201,6 +201,7 @@ needToLink() {
+ linkAgainstLibrary($$library,
$$eval(WEBKIT.$${library_identifier}.root_source_dir))
+ LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+ }
++ posix:!darwin: LIBS += -lpthread
+ }
+
+ creating_module {
+
diff --git a/xorg-extras/xterm/DETAILS b/xorg-extras/xterm/DETAILS
index c9ac92c..9a5fedb 100755
--- a/xorg-extras/xterm/DETAILS
+++ b/xorg-extras/xterm/DETAILS
@@ -1,5 +1,5 @@
SPELL=xterm
- VERSION=322
+ VERSION=324
SOURCE=$SPELL-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://invisible-island.net/xterm/$SOURCE
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index 3fb74ee..34d3df4 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,6 @@
+2016-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 324
+
2016-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 322
diff --git a/xorg-lib/libxcb/DEPENDS b/xorg-lib/libxcb/DEPENDS
index 387b120..a248f6d 100755
--- a/xorg-lib/libxcb/DEPENDS
+++ b/xorg-lib/libxcb/DEPENDS
@@ -16,7 +16,7 @@ fi &&
optional_depends doxygen \
'' \
- '--disable-build-docs' \
+ '--disable-devel-docs' \
'to build documentation' &&
optional_depends libselinux \
diff --git a/xorg-lib/libxcb/DETAILS b/xorg-lib/libxcb/DETAILS
index 0f19cd8..a487630 100755
--- a/xorg-lib/libxcb/DETAILS
+++ b/xorg-lib/libxcb/DETAILS
@@ -1,9 +1,9 @@
SPELL=libxcb
- VERSION=1.11.1
-
SOURCE_HASH=sha512:30471b053097d68008142bada9ca3efd9121305f0180d28a5ca9b62821f711a3ad63a667bdfb31f8f97020ed7aa9509f8248effbd65c80e6cda7375135dc96eb
+ VERSION=1.12
+
SOURCE_HASH=sha512:4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.bz2"
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:
SOURCE_URL[0]=http://xcb.freedesktop.org/dist/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://xcb.freedesktop.org
diff --git a/xorg-lib/libxcb/HISTORY b/xorg-lib/libxcb/HISTORY
index 77b7a28..59bab46 100644
--- a/xorg-lib/libxcb/HISTORY
+++ b/xorg-lib/libxcb/HISTORY
@@ -1,3 +1,8 @@
+2016-05-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12
+ * PRE_BUILD: deleted
+ * DEPENDS: dajust flags
+
2015-09-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11.1
diff --git a/xorg-lib/libxcb/PRE_BUILD b/xorg-lib/libxcb/PRE_BUILD
deleted file mode 100755
index 9ce2b52..0000000
--- a/xorg-lib/libxcb/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL python3; then
- 2to3 -wn --no-diffs src/c_client.py &&
-
- # fix detection of python-3.4
- sed -i 's/python /python3.4/' configure
-fi
diff --git a/xorg-proto/xcb-proto/DETAILS b/xorg-proto/xcb-proto/DETAILS
index 18b4349..ec658b7 100755
--- a/xorg-proto/xcb-proto/DETAILS
+++ b/xorg-proto/xcb-proto/DETAILS
@@ -1,8 +1,8 @@
SPELL=xcb-proto
- VERSION=1.11
-
SOURCE_HASH=sha512:13c228d974f99e2f17a7352629b85c76674e395567474997015941780df123f9c809a76935242aaf31b7836b0478bd557e3cc9161dd4880b4fb8eb576216dbc1
+ VERSION=1.12
+
SOURCE_HASH=sha512:1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
SOURCE="$SPELL-$VERSION.tar.bz2"
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+#
SOURCE_GPG="gurus.gpg:1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
SOURCE_URL[0]=http://xcb.freedesktop.org/dist/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
LICENSE[0]=XCL
diff --git a/xorg-proto/xcb-proto/HISTORY b/xorg-proto/xcb-proto/HISTORY
index d4ef152..1642973 100644
--- a/xorg-proto/xcb-proto/HISTORY
+++ b/xorg-proto/xcb-proto/HISTORY
@@ -1,3 +1,6 @@
+2016-05-19 Treeve Jelbert <treeve$sourcemage.org>
+ * DETAILS: version 1.12
+
2014-08-04 Treeve Jelbert <treeve$sourcemage.org>
* DETAILS: version 1.11
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e36d557c9c69f59f9e53a7292f1ecfb66d1b2510), Treeve Jelbert, 05/19/2016
Archive powered by MHonArc 2.6.24.