initial gs5.84 checkin with pcl and xl compiling.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@857 06663e23-700e-0410-b217-a244a6096597

1 files changed, 301 insertions, 215 deletions

diff --git a/gs/src/contrib.mak b/gs/src/contrib.mak
index 49e1a3130..e6553b2c7 100644
--- a/gs/src/contrib.mak
+++ b/gs/src/contrib.mak
@@ -1,4 +1,4 @@
-#    Copyright (C) 1989, 1996, 1997, 1998 Aladdin Enterprises.  All rights reserved.
+#    Copyright (C) 1989, 1996, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved.
 # 
 # This file is part of Aladdin Ghostscript.
 # 
@@ -26,7 +26,8 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 # The following drivers are user-contributed, and maintained (if at all)
 # by users.  Please do not ask Aladdin about problems with these drivers.
 
-# MS-DOS displays (note: not usable with Desqview/X):
+# Displays:
+#   MS-DOS (note: not usable with Desqview/X):
 # *	herc	Hercules Graphics display   [MS-DOS only]
 # *	pe	Private Eye display
 #   Unix and VMS:
@@ -52,10 +53,13 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 #		also good for DeskJet 510, 520, and 540C (black only)
 # *	cdj500	H-P DeskJet 500C (same as cdjcolor)
 # *	cdj550	H-P DeskJet 550C/560C/660C/660Cse
+# *	coslw2p  CoStar LabelWriter II II/Plus
+# *	coslwxl  CoStar LabelWriter XL
 # *	cp50	Mitsubishi CP50 color printer
 # *	declj250  alternate DEC LJ250 driver
 # *	djet500c  H-P DeskJet 500C alternate driver
 #		(does not work on 550C or 560C)
+# *	dl2100	DEC DEClaser 2100 printer
 # *	dnj650c  H-P DesignJet 650C
 #	epson	Epson-compatible dot matrix printers (9- or 24-pin)
 # *	eps9mid  Epson-compatible 9-pin, interleaved lines
@@ -79,10 +83,12 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 # *	lips3	Canon LIPS III laser printer in English (CaPSL) mode
 # *	ln03	DEC LN03 printer
 # *	lj250	DEC LJ250 Companion color printer
+# *	lj3100sw H-P LaserJet 3100 (requires installed HP-Software)
 # +	lj4dith  H-P LaserJet 4 with Floyd-Steinberg dithering
 # *	lp8000	Epson LP-8000 laser printer
 # *     lq850   Epson LQ850 printer at 360 x 360 DPI resolution;
 #               also good for Canon BJ300 with LQ850 emulation
+# *	lxm5700m Lexmark 5700 monotone
 # *	m8510	C.Itoh M8510 printer
 # *	necp6	NEC P6/P6+/P60 printers at 360 x 360 DPI resolution
 # *	nwp533  Sony Microsystems NWP533 laser printer   [Sony only]
@@ -119,6 +125,7 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 # *	mgr4	4-bit (VGA) color MGR devices
 # *	mgr8	8-bit color MGR devices
 # *	sgirgb	SGI RGB pixmap format
+# *	sunhmono  Harlequin variant of 1-bit Sun raster file
 
 # If you add drivers, it would be nice if you kept each list
 # in alphabetical order.
@@ -130,10 +137,10 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 ### ------------------- The Hercules Graphics display ------------------- ###
 
 herc_=$(GLOBJ)gdevherc.$(OBJ)
-herc.dev: $(herc_)
-	$(SETDEV) herc $(herc_)
+$(DD)herc.dev : $(herc_)
+	$(SETDEV) $(DD)herc $(herc_)
 
-$(GLOBJ)gdevherc.$(OBJ): $(GLSRC)gdevherc.c $(GDEV) $(dos__h)\
+$(GLOBJ)gdevherc.$(OBJ) : $(GLSRC)gdevherc.c $(GDEV) $(dos__h)\
  $(gsmatrix_h) $(gxbitmap_h)
 	$(GLCC) $(GLO_)gdevherc.$(OBJ) $(C_) $(GLSRC)gdevherc.c
 
@@ -142,10 +149,10 @@ $(GLOBJ)gdevherc.$(OBJ): $(GLSRC)gdevherc.c $(GDEV) $(dos__h)\
 ###   please contact narf@media-lab.media.mit.edu if you have questions.  ###
 
 pe_=$(GLOBJ)gdevpe.$(OBJ)
-pe.dev: $(pe_)
-	$(SETDEV) pe $(pe_)
+$(DD)pe.dev : $(pe_)
+	$(SETDEV) $(DD)pe $(pe_)
 
-$(GLOBJ)gdevpe.$(OBJ): $(GLSRC)gdevpe.c $(GDEV) $(memory__h)
+$(GLOBJ)gdevpe.$(OBJ) : $(GLSRC)gdevpe.c $(GDEV) $(memory__h)
 	$(GLCC) $(GLO_)gdevpe.$(OBJ) $(C_) $(GLSRC)gdevpe.c
 
 ###### ----------------------- Other displays ------------------------ ######
@@ -155,10 +162,10 @@ $(GLOBJ)gdevpe.$(OBJ): $(GLSRC)gdevpe.c $(GDEV) $(memory__h)
 ###       Andy Fyfe (andy@cs.caltech.edu) if you have questions.          ###
 
 att3b1_=$(GLOBJ)gdev3b1.$(OBJ)
-att3b1.dev: $(att3b1_)
-	$(SETDEV) att3b1 $(att3b1_)
+$(DD)att3b1.dev : $(att3b1_)
+	$(SETDEV) $(DD)att3b1 $(att3b1_)
 
-$(GLOBJ)gdev3b1.$(OBJ): $(GLSRC)gdev3b1.c $(GDEV)
+$(GLOBJ)gdev3b1.$(OBJ) : $(GLSRC)gdev3b1.c $(GDEV)
 	$(GLCC) $(GLO_)gdev3b1.$(OBJ) $(C_) $(GLSRC)gdev3b1.c
 
 ### ------------------- Sony NeWS frame buffer device ------------------ ###
@@ -167,10 +174,10 @@ $(GLOBJ)gdev3b1.$(OBJ): $(GLSRC)gdev3b1.c $(GDEV)
 
 # This is implemented as a 'printer' device.
 sonyfb_=$(GLOBJ)gdevsnfb.$(OBJ)
-sonyfb.dev: $(sonyfb_) page.dev
-	$(SETPDEV) sonyfb $(sonyfb_)
+$(DD)sonyfb.dev : $(sonyfb_) $(DD)page.dev
+	$(SETPDEV) $(DD)sonyfb $(sonyfb_)
 
-$(GLOBJ)gdevsnfb.$(OBJ): $(GLSRC)gdevsnfb.c $(PDEVH)
+$(GLOBJ)gdevsnfb.$(OBJ) : $(GLSRC)gdevsnfb.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevsnfb.$(OBJ) $(C_) $(GLSRC)gdevsnfb.c
 
 ### ------------------------ The SunView device ------------------------ ###
@@ -178,11 +185,11 @@ $(GLOBJ)gdevsnfb.$(OBJ): $(GLSRC)gdevsnfb.c $(PDEVH)
 ###       please contact Andreas Stolcke (stolcke@icsi.berkeley.edu).    ###
 
 sunview_=$(GLOBJ)gdevsun.$(OBJ)
-sunview.dev: $(sunview_)
-	$(SETDEV) sunview $(sunview_)
-	$(ADDMOD) sunview -lib suntool sunwindow pixrect
+$(DD)sunview.dev : $(sunview_)
+	$(SETDEV) $(DD)sunview $(sunview_)
+	$(ADDMOD) $(GLGEN)sunview -lib suntool sunwindow pixrect
 
-$(GLOBJ)gdevsun.$(OBJ): $(GLSRC)gdevsun.c $(GDEV) $(malloc__h)\
+$(GLOBJ)gdevsun.$(OBJ) : $(GLSRC)gdevsun.c $(GDEV) $(malloc__h)\
  $(gscdefs_h) $(gserrors_h) $(gsmatrix_h)
 	$(GLCC) $(GLO_)gdevsun.$(OBJ) $(C_) $(GLSRC)gdevsun.c
 
@@ -193,8 +200,8 @@ $(GLOBJ)gdevsun.$(OBJ): $(GLSRC)gdevsun.c $(GDEV) $(malloc__h)\
 # This is a "printer" device, but it probably shouldn't be.
 # I don't know why the implementor chose to do it this way.
 sxlcrt_=$(GLOBJ)gdevln03.$(OBJ)
-sxlcrt.dev: $(sxlcrt_) page.dev
-	$(SETPDEV) sxlcrt $(sxlcrt_)
+$(DD)sxlcrt.dev : $(sxlcrt_) $(DD)page.dev
+	$(SETPDEV) $(DD)sxlcrt $(sxlcrt_)
 
 ###### --------------- Memory-buffered printer devices --------------- ######
 
@@ -209,32 +216,32 @@ sxlcrt.dev: $(sxlcrt_) page.dev
 
 appledmp_=$(GLOBJ)gdevadmp.$(OBJ)
 
-$(GLOBJ)gdevadmp.$(OBJ): $(GLSRC)gdevadmp.c $(PDEVH)
+$(GLOBJ)gdevadmp.$(OBJ) : $(GLSRC)gdevadmp.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevadmp.$(OBJ) $(C_) $(GLSRC)gdevadmp.c
 
-appledmp.dev: $(appledmp_) page.dev
-	$(SETPDEV) appledmp $(appledmp_)
+$(DD)appledmp.dev : $(appledmp_) $(DD)page.dev
+	$(SETPDEV) $(DD)appledmp $(appledmp_)
 
-iwhi.dev: $(appledmp_) page.dev
-	$(SETPDEV) iwhi $(appledmp_)
+$(DD)iwhi.dev : $(appledmp_) $(DD)page.dev
+	$(SETPDEV) $(DD)iwhi $(appledmp_)
 
-iwlo.dev: $(appledmp_) page.dev
-	$(SETPDEV) iwlo $(appledmp_)
+$(DD)iwlo.dev : $(appledmp_) $(DD)page.dev
+	$(SETPDEV) $(DD)iwlo $(appledmp_)
 
-iwlq.dev: $(appledmp_) page.dev
-	$(SETPDEV) iwlq $(appledmp_)
+$(DD)iwlq.dev : $(appledmp_) $(DD)page.dev
+	$(SETPDEV) $(DD)iwlq $(appledmp_)
 
 ### ------------ The Canon BubbleJet BJ10e and BJ200 devices ------------ ###
 
 bj10e_=$(GLOBJ)gdevbj10.$(OBJ)
 
-bj10e.dev: $(bj10e_) page.dev
-	$(SETPDEV) bj10e $(bj10e_)
+$(DD)bj10e.dev : $(bj10e_) $(DD)page.dev
+	$(SETPDEV) $(DD)bj10e $(bj10e_)
 
-bj200.dev: $(bj10e_) page.dev
-	$(SETPDEV) bj200 $(bj10e_)
+$(DD)bj200.dev : $(bj10e_) $(DD)page.dev
+	$(SETPDEV) $(DD)bj200 $(bj10e_)
 
-$(GLOBJ)gdevbj10.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
+$(GLOBJ)gdevbj10.$(OBJ) : $(GLSRC)gdevbj10.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevbj10.$(OBJ) $(C_) $(GLSRC)gdevbj10.c
 
 ### ------------- The CalComp Raster Format ----------------------------- ###
@@ -243,10 +250,10 @@ $(GLOBJ)gdevbj10.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
 ###       questions.                                                      ###
 
 ccr_=$(GLOBJ)gdevccr.$(OBJ)
-ccr.dev: $(ccr_) page.dev
-	$(SETPDEV) ccr $(ccr_)
+$(DD)ccr.dev : $(ccr_) $(DD)page.dev
+	$(SETPDEV) $(DD)ccr $(ccr_)
 
-$(GLOBJ)gdevccr.$(OBJ): $(GLSRC)gdevccr.c $(PDEVH)
+$(GLOBJ)gdevccr.$(OBJ) : $(GLSRC)gdevccr.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevccr.$(OBJ) $(C_) $(GLSRC)gdevccr.c
 
 ### The H-P DeskJet, PaintJet, and DesignJet family color printer devices.###
@@ -264,74 +271,111 @@ $(GLOBJ)gdevccr.$(OBJ): $(GLSRC)gdevccr.c $(PDEVH)
 
 cdeskjet_=$(GLOBJ)gdevcdj.$(OBJ) $(HPPCL)
 
-cdeskjet.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) cdeskjet $(cdeskjet_)
+$(DD)cdeskjet.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)cdeskjet $(cdeskjet_)
 
-cdjcolor.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) cdjcolor $(cdeskjet_)
+$(DD)cdjcolor.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)cdjcolor $(cdeskjet_)
 
-cdjmono.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) cdjmono $(cdeskjet_)
+$(DD)cdjmono.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)cdjmono $(cdeskjet_)
 
-cdj500.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) cdj500 $(cdeskjet_)
+$(DD)cdj500.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)cdj500 $(cdeskjet_)
 
-cdj550.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) cdj550 $(cdeskjet_)
+$(DD)cdj550.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)cdj550 $(cdeskjet_)
 
-declj250.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) declj250 $(cdeskjet_)
+$(DD)declj250.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)declj250 $(cdeskjet_)
 
-dnj650c.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) dnj650c $(cdeskjet_)
+$(DD)dnj650c.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)dnj650c $(cdeskjet_)
 
-lj4dith.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) lj4dith $(cdeskjet_)
+$(DD)lj4dith.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)lj4dith $(cdeskjet_)
 
-pj.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) pj $(cdeskjet_)
+$(DD)pj.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)pj $(cdeskjet_)
 
-pjxl.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) pjxl $(cdeskjet_)
+$(DD)pjxl.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)pjxl $(cdeskjet_)
 
 # Note: the pjxl300 driver also works for the CopyJet.
-pjxl300.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) pjxl300 $(cdeskjet_)
+$(DD)pjxl300.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)pjxl300 $(cdeskjet_)
 
 # Note: the BJC600 driver also works for the BJC4000.
-bjc600.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) bjc600 $(cdeskjet_)
+$(DD)bjc600.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)bjc600 $(cdeskjet_)
 
-bjc800.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) bjc800 $(cdeskjet_)
+$(DD)bjc800.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)bjc800 $(cdeskjet_)
 
-escp.dev: $(cdeskjet_) page.dev
-	$(SETPDEV) escp $(cdeskjet_)
+$(DD)escp.dev : $(cdeskjet_) $(DD)page.dev
+	$(SETPDEV) $(DD)escp $(cdeskjet_)
 
 # NB: you can also customise the build if required, using
 # -DBitsPerPixel=<number> if you wish the default to be other than 24
 # for the generic drivers (cdj500, cdj550, pjxl300, pjtest, pjxltest).
-$(GLOBJ)gdevcdj.$(OBJ): $(GLSRC)gdevcdj.c $(std_h) $(PDEVH) $(GLSRC)gdevbjc.h\
+
+gdevbjc_h=$(GLSRC)gdevbjc.h
+
+$(GLOBJ)gdevcdj.$(OBJ) : $(GLSRC)gdevcdj.c $(std_h) $(PDEVH)\
  $(gsparam_h) $(gsstate_h) $(gxlum_h)\
- $(gdevpcl_h)
+ $(gdevbjc_h) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevcdj.$(OBJ) $(C_) $(GLSRC)gdevcdj.c
 
 djet500c_=$(GLOBJ)gdevdjtc.$(OBJ) $(HPPCL)
-djet500c.dev: $(djet500c_) page.dev
-	$(SETPDEV) djet500c $(djet500c_)
+$(DD)djet500c.dev : $(djet500c_) $(DD)page.dev
+	$(SETPDEV) $(DD)djet500c $(djet500c_)
 
-$(GLOBJ)gdevdjtc.$(OBJ): $(GLSRC)gdevdjtc.c $(PDEVH) $(malloc__h) $(gdevpcl_h)
+$(GLOBJ)gdevdjtc.$(OBJ) : $(GLSRC)gdevdjtc.c $(PDEVH) $(malloc__h) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevdjtc.$(OBJ) $(C_) $(GLSRC)gdevdjtc.c
 
+### --------------- The H-P LaserJet 3100 software device --------------- ###
+
+### NOTE: This driver requires installed HP-Software to print.            ###
+###       It can be used with smbclient to print from an UNIX box to a    ###
+###       LaserJet 3100 printer attached to a MS-Windows box.             ###
+### NOTE: this driver was contributed by a user: please contact           ###
+###       Ulrich Schmid (uschmid@mail.hh.provi.de) if you have questions. ###
+
+lj3100sw_=$(GLOBJ)gdevl31s.$(OBJ) $(GLOBJ)gdevmeds.$(OBJ)
+$(DD)lj3100sw.dev : $(lj3100sw_) $(DD)page.dev
+	$(SETPDEV) $(DD)lj3100sw $(lj3100sw_)
+
+gdevmeds_h=$(GLSRC)gdevmeds.h $(gdevprn_h)
+
+$(GLOBJ)gdevl31s.$(OBJ) : $(GLSRC)gdevl31s.c $(gdevmeds_h) $(PDEVH)
+	$(GLCC) $(GLO_)gdevl31s.$(OBJ) $(C_) $(GLSRC)gdevl31s.c
+
+$(GLOBJ)gdevmeds.$(OBJ) : $(GLSRC)gdevmeds.c $(AK) $(gdevmeds_h)
+	$(GLCC) $(GLO_)gdevmeds.$(OBJ) $(C_) $(GLSRC)gdevmeds.c
+
+### ------ CoStar LabelWriter II II/Plus device ------ ###
+### Contributed by Mike McCauley mikem@open.com.au     ###
+
+coslw_=$(GLOBJ)gdevcslw.$(OBJ)
+
+$(DD)coslw2p.dev : $(coslw_) $(DD)page.dev
+	$(SETPDEV) $(DD)coslw2p $(coslw_)
+
+$(DD)coslwxl.dev : $(coslw_) page.dev
+	$(SETPDEV) ($DD)coslwxl $(coslw_)
+
+$(GLOBJ)gdevcslw.$(OBJ) : $(GLSRC)gdevcslw.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevcslw.$(OBJ) $(C_) $(GLSRC)gdevcslw.c
+
 ### -------------------- The Mitsubishi CP50 printer -------------------- ###
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Michael Hu (michael@ximage.com) if you have questions.          ###
 
 cp50_=$(GLOBJ)gdevcp50.$(OBJ)
-cp50.dev: $(cp50_) page.dev
-	$(SETPDEV) cp50 $(cp50_)
+$(DD)cp50.dev : $(cp50_) $(DD)page.dev
+	$(SETPDEV) $(DD)cp50 $(cp50_)
 
-$(GLOBJ)gdevcp50.$(OBJ): $(GLSRC)gdevcp50.c $(PDEVH)
+$(GLOBJ)gdevcp50.$(OBJ) : $(GLSRC)gdevcp50.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevcp50.$(OBJ) $(C_) $(GLSRC)gdevcp50.c
 
 ### ----------------- The generic Epson printer device ----------------- ###
@@ -343,32 +387,32 @@ $(GLOBJ)gdevcp50.$(OBJ): $(GLSRC)gdevcp50.c $(PDEVH)
 
 epson_=$(GLOBJ)gdevepsn.$(OBJ)
 
-epson.dev: $(epson_) page.dev
-	$(SETPDEV) epson $(epson_)
+$(DD)epson.dev : $(epson_) $(DD)page.dev
+	$(SETPDEV) $(DD)epson $(epson_)
 
-eps9mid.dev: $(epson_) page.dev
-	$(SETPDEV) eps9mid $(epson_)
+$(DD)eps9mid.dev : $(epson_) $(DD)page.dev
+	$(SETPDEV) $(DD)eps9mid $(epson_)
 
-eps9high.dev: $(epson_) page.dev
-	$(SETPDEV) eps9high $(epson_)
+$(DD)eps9high.dev : $(epson_) $(DD)page.dev
+	$(SETPDEV) $(DD)eps9high $(epson_)
 
-$(GLOBJ)gdevepsn.$(OBJ): $(GLSRC)gdevepsn.c $(PDEVH)
+$(GLOBJ)gdevepsn.$(OBJ) : $(GLSRC)gdevepsn.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevepsn.$(OBJ) $(C_) $(GLSRC)gdevepsn.c
 
 ### ----------------- The IBM Proprinter printer device ---------------- ###
 
-ibmpro.dev: $(epson_) page.dev
-	$(SETPDEV) ibmpro $(epson_)
+$(DD)ibmpro.dev : $(epson_) $(DD)page.dev
+	$(SETPDEV) $(DD)ibmpro $(epson_)
 
 ### -------------- The Epson LQ-2550 color printer device -------------- ###
 ### Note: this driver was contributed by users: please contact           ###
 ###       Dave St. Clair (dave@exlog.com) if you have questions.         ###
 
 epsonc_=$(GLOBJ)gdevepsc.$(OBJ)
-epsonc.dev: $(epsonc_) page.dev
-	$(SETPDEV) epsonc $(epsonc_)
+$(DD)epsonc.dev : $(epsonc_) $(DD)page.dev
+	$(SETPDEV) $(DD)epsonc $(epsonc_)
 
-$(GLOBJ)gdevepsc.$(OBJ): $(GLSRC)gdevepsc.c $(PDEVH)
+$(GLOBJ)gdevepsc.$(OBJ) : $(GLSRC)gdevepsc.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevepsc.$(OBJ) $(C_) $(GLSRC)gdevepsc.c
 
 ### ------------- The Epson ESC/P 2 language printer devices ------------- ###
@@ -380,36 +424,36 @@ $(GLOBJ)gdevepsc.$(OBJ): $(GLSRC)gdevepsc.c $(PDEVH)
 
 ESCP2=$(GLOBJ)gdevescp.$(OBJ)
 
-$(GLOBJ)gdevescp.$(OBJ): $(GLSRC)gdevescp.c $(PDEVH)
+$(GLOBJ)gdevescp.$(OBJ) : $(GLSRC)gdevescp.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevescp.$(OBJ) $(C_) $(GLSRC)gdevescp.c
 
-ap3250.dev: $(ESCP2) page.dev
-	$(SETPDEV) ap3250 $(ESCP2)
+$(DD)ap3250.dev : $(ESCP2) $(DD)page.dev
+	$(SETPDEV) $(DD)ap3250 $(ESCP2)
 
-st800.dev: $(ESCP2) page.dev
-	$(SETPDEV) st800 $(ESCP2)
+$(DD)st800.dev : $(ESCP2) $(DD)page.dev
+	$(SETPDEV) $(DD)st800 $(ESCP2)
 
 stcolor1_=$(GLOBJ)gdevstc.$(OBJ) $(GLOBJ)gdevstc1.$(OBJ) $(GLOBJ)gdevstc2.$(OBJ)
 stcolor2_=$(GLOBJ)gdevstc3.$(OBJ) $(GLOBJ)gdevstc4.$(OBJ)
-stcolor.dev: $(stcolor1_) $(stcolor2_) page.dev
-	$(SETPDEV) stcolor $(stcolor1_)
-	$(ADDMOD) stcolor -obj $(stcolor2_)
+$(DD)stcolor.dev : $(stcolor1_) $(stcolor2_) $(DD)page.dev
+	$(SETPDEV) $(DD)stcolor $(stcolor1_)
+	$(ADDMOD) $(GLGEN)stcolor -obj $(stcolor2_)
 
 gdevstc_h=$(GLSRC)gdevstc.h $(gdevprn_h) $(gsparam_h) $(gsstate_h)
 
-$(GLOBJ)gdevstc.$(OBJ): $(GLSRC)gdevstc.c $(gdevstc_h) $(PDEVH)
+$(GLOBJ)gdevstc.$(OBJ) : $(GLSRC)gdevstc.c $(gdevstc_h) $(PDEVH)
 	$(GLCC) $(GLO_)gdevstc.$(OBJ) $(C_) $(GLSRC)gdevstc.c
 
-$(GLOBJ)gdevstc1.$(OBJ): $(GLSRC)gdevstc1.c $(gdevstc_h) $(PDEVH)
+$(GLOBJ)gdevstc1.$(OBJ) : $(GLSRC)gdevstc1.c $(gdevstc_h) $(PDEVH)
 	$(GLCC) $(GLO_)gdevstc1.$(OBJ) $(C_) $(GLSRC)gdevstc1.c
 
-$(GLOBJ)gdevstc2.$(OBJ): $(GLSRC)gdevstc2.c $(gdevstc_h) $(PDEVH)
+$(GLOBJ)gdevstc2.$(OBJ) : $(GLSRC)gdevstc2.c $(gdevstc_h) $(PDEVH)
 	$(GLCC) $(GLO_)gdevstc2.$(OBJ) $(C_) $(GLSRC)gdevstc2.c
 
-$(GLOBJ)gdevstc3.$(OBJ): $(GLSRC)gdevstc3.c $(gdevstc_h) $(PDEVH)
+$(GLOBJ)gdevstc3.$(OBJ) : $(GLSRC)gdevstc3.c $(gdevstc_h) $(PDEVH)
 	$(GLCC) $(GLO_)gdevstc3.$(OBJ) $(C_) $(GLSRC)gdevstc3.c
 
-$(GLOBJ)gdevstc4.$(OBJ): $(GLSRC)gdevstc4.c $(gdevstc_h) $(PDEVH)
+$(GLOBJ)gdevstc4.$(OBJ) : $(GLSRC)gdevstc4.c $(gdevstc_h) $(PDEVH)
 	$(GLCC) $(GLO_)gdevstc4.$(OBJ) $(C_) $(GLSRC)gdevstc4.c
 
 ### --------------- Ugly/Update -> Unified Printer Driver ---------------- ###
@@ -417,23 +461,33 @@ $(GLOBJ)gdevstc4.$(OBJ): $(GLSRC)gdevstc4.c $(gdevstc_h) $(PDEVH)
 ###        Gunther Hess (gunther@elmos.de)                                 ###
 
 uniprint_=$(GLOBJ)gdevupd.$(OBJ)
-uniprint.dev: $(uniprint_) page.dev
-	$(SETPDEV) uniprint $(uniprint_)
+$(DD)uniprint.dev : $(uniprint_) $(DD)page.dev
+	$(SETPDEV) $(DD)uniprint $(uniprint_)
 
-$(GLOBJ)gdevupd.$(OBJ): $(GLSRC)gdevupd.c $(PDEVH) $(gsparam_h)
+$(GLOBJ)gdevupd.$(OBJ) : $(GLSRC)gdevupd.c $(PDEVH) $(gsparam_h)
 	$(GLCC) $(GLO_)gdevupd.$(OBJ) $(C_) $(GLSRC)gdevupd.c
 
 ### -------------- cdj850 - HP 850c Driver under development ------------- ###
-### Since this driver is in the development-phase it is not distributed    ###
-### with ghostscript, but it is available via anonymous ftp from:          ###
-###                        ftp://bonk.ethz.ch                              ###
 ### For questions about this driver, please contact:                       ###
-###       Uli Wortmann (E-Mail address inside the driver-package)          ###
+###       Uli Wortmann (uliw@erdw.ethz.ch)                                 ###
 
 cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
-cdj850.dev: $(cdeskjet8_) page.dev
-	$(SETPDEV) cdj850 $(cdeskjet8_)
+$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
+
+$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
+
+$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
+
+$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
+
+$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
+ $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
 
 ### ------------ The H-P PaintJet color printer device ----------------- ###
 ### Note: this driver also supports the DEC LJ250 color printer, which   ###
@@ -443,17 +497,17 @@ cdj850.dev: $(cdeskjet8_) page.dev
 
 PJET=$(GLOBJ)gdevpjet.$(OBJ) $(HPPCL)
 
-$(GLOBJ)gdevpjet.$(OBJ): $(GLSRC)gdevpjet.c $(PDEVH) $(gdevpcl_h)
+$(GLOBJ)gdevpjet.$(OBJ) : $(GLSRC)gdevpjet.c $(PDEVH) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevpjet.$(OBJ) $(C_) $(GLSRC)gdevpjet.c
 
-lj250.dev: $(PJET) page.dev
-	$(SETPDEV) lj250 $(PJET)
+$(DD)lj250.dev : $(PJET) $(DD)page.dev
+	$(SETPDEV) $(DD)lj250 $(PJET)
 
-paintjet.dev: $(PJET) page.dev
-	$(SETPDEV) paintjet $(PJET)
+$(DD)paintjet.dev : $(PJET) $(DD)page.dev
+	$(SETPDEV) $(DD)paintjet $(PJET)
 
-pjetxl.dev: $(PJET) page.dev
-	$(SETPDEV) pjetxl $(PJET)
+$(DD)pjetxl.dev : $(PJET) $(DD)page.dev
+	$(SETPDEV) $(DD)pjetxl $(PJET)
 
 ###--------------------- The Brother HL 7x0 printer --------------------- ### 
 ###                    This driver was contributed by a user :            ###
@@ -461,10 +515,10 @@ pjetxl.dev: $(PJET) page.dev
 ### if you have any questions.                                            ###
 
 hl7x0_=$(GLOBJ)gdevhl7x.$(OBJ)
-hl7x0.dev: $(hl7x0_) page.dev
-	$(SETPDEV) hl7x0 $(hl7x0_)
+$(DD)hl7x0.dev : $(hl7x0_) $(DD)page.dev
+	$(SETPDEV) $(DD)hl7x0 $(hl7x0_)
 
-$(GLOBJ)gdevhl7x.$(OBJ): $(GLSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
+$(GLOBJ)gdevhl7x.$(OBJ) : $(GLSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevhl7x.$(OBJ) $(C_) $(GLSRC)gdevhl7x.c
 
 ### -------------- Imagen ImPress Laser Printer device ----------------- ###
@@ -475,13 +529,13 @@ $(GLOBJ)gdevhl7x.$(OBJ): $(GLSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
 ### You may also add -DA4 if needed for A4 paper.			 ###
 
 imagen_=$(GLOBJ)gdevimgn.$(OBJ)
-imagen.dev: $(imagen_) page.dev
-	$(SETPDEV) imagen $(imagen_)
+$(DD)imagen.dev : $(imagen_) $(DD)page.dev
+	$(SETPDEV) $(DD)imagen $(imagen_)
 
 # Uncomment the first line for the ipr spooler, the second line for parallel.
 IMGN_OPT=
 #IMGN_OPT=-DUSE_BYTE_STREAM
-$(GLOBJ)gdevimgn.$(OBJ): $(GLSRC)gdevimgn.c $(PDEVH)
+$(GLOBJ)gdevimgn.$(OBJ) : $(GLSRC)gdevimgn.c $(PDEVH)
 	$(GLCC) $(IMGN_OPT) $(GLO_)gdevimgn.$(OBJ) $(C_) $(GLSRC)gdevimgn.c
 
 ### ------- The IBM 3852 JetPrinter color inkjet printer device -------- ###
@@ -492,10 +546,10 @@ $(GLOBJ)gdevimgn.$(OBJ): $(GLSRC)gdevimgn.c $(PDEVH)
 ###   width of the jetprinter itself.)                                   ###
 
 jetp3852_=$(GLOBJ)gdev3852.$(OBJ)
-jetp3852.dev: $(jetp3852_) page.dev
-	$(SETPDEV) jetp3852 $(jetp3852_)
+$(DD)jetp3852.dev : $(jetp3852_) $(DD)page.dev
+	$(SETPDEV) $(DD)jetp3852 $(jetp3852_)
 
-$(GLOBJ)gdev3852.$(OBJ): $(GLSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
+$(GLOBJ)gdev3852.$(OBJ) : $(GLSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdev3852.$(OBJ) $(C_) $(GLSRC)gdev3852.c
 
 ### ---------- The Canon LBP-8II and LIPS III printer devices ---------- ###
@@ -504,18 +558,20 @@ $(GLOBJ)gdev3852.$(OBJ): $(GLSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
 ###       Lauri Paatero, lauri.paatero@paatero.pp.fi                     ###
 
 lbp8_=$(GLOBJ)gdevlbp8.$(OBJ)
-lbp8.dev: $(lbp8_) page.dev
-	$(SETPDEV) lbp8 $(lbp8_)
+$(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
+	$(SETPDEV) $(DD)lbp8 $(lbp8_)
 
-lips3.dev: $(lbp8_) page.dev
-	$(SETPDEV) lips3 $(lbp8_)
+$(DD)lips3.dev : $(lbp8_) $(DD)page.dev
+	$(SETPDEV) $(DD)lips3 $(lbp8_)
 
-$(GLOBJ)gdevlbp8.$(OBJ): $(GLSRC)gdevlbp8.c $(PDEVH)
+$(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
 
-### ----------- The DEC LN03/LA50/LA70/LA75 printer devices ------------ ###
+### -------- The DEC LN03/DL2100/LA50/LA70/LA75 printer devices -------- ###
 ### Note: this driver was contributed by users: please contact           ###
 ###       Ulrich Mueller (ulm@vsnhd1.cern.ch) if you have questions.     ###
+### For questions about the DEClaser 2100, please contact                ###
+###       Nick Brown (nick.brown@coe.int).                               ###
 ### For questions about LA50 and LA75, please contact                    ###
 ###       Ian MacPhedran (macphed@dvinci.USask.CA).                      ###
 ### For questions about the LA70, please contact                         ###
@@ -524,31 +580,34 @@ $(GLOBJ)gdevlbp8.$(OBJ): $(GLSRC)gdevlbp8.c $(PDEVH)
 ###       Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de).                ###
 
 ln03_=$(GLOBJ)gdevln03.$(OBJ)
-ln03.dev: $(ln03_) page.dev
-	$(SETPDEV) ln03 $(ln03_)
+$(DD)ln03.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)ln03 $(ln03_)
+
+$(DD)dl2100.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)dl2100 $(ln03_)
 
-la50.dev: $(ln03_) page.dev
-	$(SETPDEV) la50 $(ln03_)
+$(DD)la50.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)la50 $(ln03_)
 
-la70.dev: $(ln03_) page.dev
-	$(SETPDEV) la70 $(ln03_)
+$(DD)la70.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)la70 $(ln03_)
 
-la75.dev: $(ln03_) page.dev
-	$(SETPDEV) la75 $(ln03_)
+$(DD)la75.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)la75 $(ln03_)
 
-la75plus.dev: $(ln03_) page.dev
-	$(SETPDEV) la75plus $(ln03_)
+$(DD)la75plus.dev : $(ln03_) $(DD)page.dev
+	$(SETPDEV) $(DD)la75plus $(ln03_)
 
-$(GLOBJ)gdevln03.$(OBJ): $(GLSRC)gdevln03.c $(PDEVH)
+$(GLOBJ)gdevln03.$(OBJ) : $(GLSRC)gdevln03.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevln03.$(OBJ) $(C_) $(GLSRC)gdevln03.c
 
 # LA70 driver with low-resolution text enhancement.
 
 la70t_=$(GLOBJ)gdevla7t.$(OBJ)
-la70t.dev: $(la70t_) page.dev
-	$(SETPDEV) la70t $(la70t_)
+$(DD)la70t.dev : $(la70t_) $(DD)page.dev
+	$(SETPDEV) $(DD)la70t $(la70t_)
 
-$(GLOBJ)gdevla7t.$(OBJ): $(GLSRC)gdevla7t.c $(PDEVH)
+$(GLOBJ)gdevla7t.$(OBJ) : $(GLSRC)gdevla7t.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevla7t.$(OBJ) $(C_) $(GLSRC)gdevla7t.c
 
 ### -------------- The Epson LP-8000 laser printer device -------------- ###
@@ -556,10 +615,10 @@ $(GLOBJ)gdevla7t.$(OBJ): $(GLSRC)gdevla7t.c $(PDEVH)
 ###       Oleg Fat'yanov <faty1@rlem.titech.ac.jp> if you have questions.###
 
 lp8000_=$(GLOBJ)gdevlp8k.$(OBJ)
-lp8000.dev: $(lp8000_) page.dev
-	$(SETPDEV) lp8000 $(lp8000_)
+$(DD)lp8000.dev : $(lp8000_) $(DD)page.dev
+	$(SETPDEV) $(DD)lp8000 $(lp8000_)
 
-$(GLOBJ)gdevlp8k.$(OBJ): $(GLSRC)gdevlp8k.c $(PDEVH)
+$(GLOBJ)gdevlp8k.$(OBJ) : $(GLSRC)gdevlp8k.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevlp8k.$(OBJ) $(C_) $(GLSRC)gdevlp8k.c
 
 ### -------------- The C.Itoh M8510 printer device --------------------- ###
@@ -567,10 +626,10 @@ $(GLOBJ)gdevlp8k.$(OBJ): $(GLSRC)gdevlp8k.c $(PDEVH)
 ###       Smith <bob@snuffy.penfield.ny.us> if you have questions.       ###
 
 m8510_=$(GLOBJ)gdev8510.$(OBJ)
-m8510.dev: $(m8510_) page.dev
-	$(SETPDEV) m8510 $(m8510_)
+$(DD)m8510.dev : $(m8510_) $(DD)page.dev
+	$(SETPDEV) $(DD)m8510 $(m8510_)
 
-$(GLOBJ)gdev8510.$(OBJ): $(GLSRC)gdev8510.c $(PDEVH)
+$(GLOBJ)gdev8510.$(OBJ) : $(GLSRC)gdev8510.c $(PDEVH)
 	$(GLCC) $(GLO_)gdev8510.$(OBJ) $(C_) $(GLSRC)gdev8510.c
 
 ### -------------- 24pin Dot-matrix printer with 360DPI ---------------- ###
@@ -581,24 +640,35 @@ $(GLOBJ)gdev8510.$(OBJ): $(GLSRC)gdev8510.c $(PDEVH)
 ###      questions about the Epson LQ850.                                ###
 
 dm24_=$(GLOBJ)gdevdm24.$(OBJ)
-necp6.dev: $(dm24_) page.dev
-	$(SETPDEV) necp6 $(dm24_)
+$(DD)necp6.dev : $(dm24_) $(DD)page.dev
+	$(SETPDEV) $(DD)necp6 $(dm24_)
 
-lq850.dev: $(dm24_) page.dev
-	$(SETPDEV) lq850 $(dm24_)
+$(DD)lq850.dev : $(dm24_) $(DD)page.dev
+	$(SETPDEV) $(DD)lq850 $(dm24_)
 
-$(GLOBJ)gdevdm24.$(OBJ): $(GLSRC)gdevdm24.c $(PDEVH)
+$(GLOBJ)gdevdm24.$(OBJ) : $(GLSRC)gdevdm24.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevdm24.$(OBJ) $(C_) $(GLSRC)gdevdm24.c
 
+### ----------------- Lexmark 5700 printer ----------------------------- ###
+### Note: this driver was contributed by users.  Please contact:         ###
+###   Stephen Taylor (setaylor@ma.ultranet.com) if you have questions.   ###
+
+lxm5700m_=$(GLOBJ)gdevlxm.$(OBJ)
+$(DD)lxm5700m.dev : $(lxm5700m_) $(DD)page.dev
+	$(SETPDEV) $(DD)lxm5700m $(lxm5700m_)
+
+$(GLOBJ)gdevlxm.$(OBJ) : $(GLSRC)gdevlxm.c $(PDEVH) $(gsparams_h)
+	$(GLCC) $(GLO_)gdevlxm.$(OBJ) $(C_) $(GLSRC)gdevlxm.c
+
 ### ----------------- The Okidata MicroLine 182 device ----------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Maarten Koning (smeg@bnr.ca) if you have questions.            ###
 
 oki182_=$(GLOBJ)gdevo182.$(OBJ)
-oki182.dev: $(oki182_) page.dev
-	$(SETPDEV) oki182 $(oki182_)
+$(DD)oki182.dev : $(oki182_) $(DD)page.dev
+	$(SETPDEV) $(DD)oki182 $(oki182_)
 
-$(GLOBJ)gdevo182.$(OBJ): $(GLSRC)gdevo182.c $(PDEVH)
+$(GLOBJ)gdevo182.$(OBJ) : $(GLSRC)gdevo182.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevo182.$(OBJ) $(C_) $(GLSRC)gdevo182.c
 
 ### ------------- The Okidata IBM compatible printer device ------------ ###
@@ -606,10 +676,10 @@ $(GLOBJ)gdevo182.$(OBJ): $(GLSRC)gdevo182.c $(PDEVH)
 ###       Charles Mack (chasm@netcom.com) if you have questions.         ###
 
 okiibm_=$(GLOBJ)gdevokii.$(OBJ)
-okiibm.dev: $(okiibm_) page.dev
-	$(SETPDEV) okiibm $(okiibm_)
+$(DD)okiibm.dev : $(okiibm_) $(DD)page.dev
+	$(SETPDEV) $(DD)okiibm $(okiibm_)
 
-$(GLOBJ)gdevokii.$(OBJ): $(GLSRC)gdevokii.c $(PDEVH)
+$(GLOBJ)gdevokii.$(OBJ) : $(GLSRC)gdevokii.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevokii.$(OBJ) $(C_) $(GLSRC)gdevokii.c
 
 ### ------------- The Ricoh 4081 laser printer device ------------------ ###
@@ -617,11 +687,11 @@ $(GLOBJ)gdevokii.$(OBJ): $(GLSRC)gdevokii.c $(PDEVH)
 ###       please contact kdw@oasis.icl.co.uk if you have questions.      ###
 
 r4081_=$(GLOBJ)gdev4081.$(OBJ)
-r4081.dev: $(r4081_) page.dev
-	$(SETPDEV) r4081 $(r4081_)
+$(DD)r4081.dev : $(r4081_) $(DD)page.dev
+	$(SETPDEV) $(DD)r4081 $(r4081_)
 
 
-$(GLOBJ)gdev4081.$(OBJ): $(GLSRC)gdev4081.c $(PDEVH)
+$(GLOBJ)gdev4081.$(OBJ) : $(GLSRC)gdev4081.c $(PDEVH)
 	$(GLCC) $(GLO_)gdev4081.$(OBJ) $(C_) $(GLSRC)gdev4081.c
 
 ### -------------------- Sony NWP533 printer device -------------------- ###
@@ -629,10 +699,10 @@ $(GLOBJ)gdev4081.$(OBJ): $(GLSRC)gdev4081.c $(PDEVH)
 ###       Kivinen (kivinen@joker.cs.hut.fi) if you have questions.       ###
 
 nwp533_=$(GLOBJ)gdevn533.$(OBJ)
-nwp533.dev: $(nwp533_) page.dev
-	$(SETPDEV) nwp533 $(nwp533_)
+$(DD)nwp533.dev : $(nwp533_) $(DD)page.dev
+	$(SETPDEV) $(DD)nwp533 $(nwp533_)
 
-$(GLOBJ)gdevn533.$(OBJ): $(GLSRC)gdevn533.c $(PDEVH)
+$(GLOBJ)gdevn533.$(OBJ) : $(GLSRC)gdevn533.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevn533.$(OBJ) $(C_) $(GLSRC)gdevn533.c
 
 ### ------------------------- The SPARCprinter ------------------------- ###
@@ -642,10 +712,10 @@ $(GLOBJ)gdevn533.$(OBJ): $(GLSRC)gdevn533.c $(PDEVH)
 ### Please consult the source code for additional documentation.         ###
 
 sparc_=$(GLOBJ)gdevsppr.$(OBJ)
-sparc.dev: $(sparc_) page.dev
-	$(SETPDEV) sparc $(sparc_)
+$(DD)sparc.dev : $(sparc_) $(DD)page.dev
+	$(SETPDEV) $(DD)sparc $(sparc_)
 
-$(GLOBJ)gdevsppr.$(OBJ): $(GLSRC)gdevsppr.c $(PDEVH)
+$(GLOBJ)gdevsppr.$(OBJ) : $(GLSRC)gdevsppr.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevsppr.$(OBJ) $(C_) $(GLSRC)gdevsppr.c
 
 ### ----------------- The StarJet SJ48 device -------------------------- ###
@@ -654,10 +724,10 @@ $(GLOBJ)gdevsppr.$(OBJ): $(GLSRC)gdevsppr.c $(PDEVH)
 ###       please contact Mats Akerblom (f86ma@dd.chalmers.se).           ###
 
 sj48_=$(GLOBJ)gdevsj48.$(OBJ)
-sj48.dev: $(sj48_) page.dev
-	$(SETPDEV) sj48 $(sj48_)
+$(DD)sj48.dev : $(sj48_) $(DD)page.dev
+	$(SETPDEV) $(DD)sj48 $(sj48_)
 
-$(GLOBJ)gdevsj48.$(OBJ): $(GLSRC)gdevsj48.c $(PDEVH)
+$(GLOBJ)gdevsj48.$(OBJ) : $(GLSRC)gdevsj48.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevsj48.$(OBJ) $(C_) $(GLSRC)gdevsj48.c
 
 ### ----------------- Tektronix 4396d color printer -------------------- ###
@@ -666,16 +736,16 @@ $(GLOBJ)gdevsj48.$(OBJ): $(GLSRC)gdevsj48.c $(PDEVH)
 ###       if you have questions.                                         ###
 
 t4693d_=$(GLOBJ)gdev4693.$(OBJ)
-t4693d2.dev: $(t4693d_) page.dev
-	$(SETPDEV) t4693d2 $(t4693d_)
+$(DD)t4693d2.dev : $(t4693d_) $(DD)page.dev
+	$(SETPDEV) $(DD)t4693d2 $(t4693d_)
 
-t4693d4.dev: $(t4693d_) page.dev
-	$(SETPDEV) t4693d4 $(t4693d_)
+$(DD)t4693d4.dev : $(t4693d_) $(DD)page.dev
+	$(SETPDEV) $(DD)t4693d4 $(t4693d_)
 
-t4693d8.dev: $(t4693d_) page.dev
-	$(SETPDEV) t4693d8 $(t4693d_)
+$(DD)t4693d8.dev : $(t4693d_) $(DD)page.dev
+	$(SETPDEV) $(DD)t4693d8 $(t4693d_)
 
-$(GLOBJ)gdev4693.$(OBJ): $(GLSRC)gdev4693.c $(PDEVH)
+$(GLOBJ)gdev4693.$(OBJ) : $(GLSRC)gdev4693.c $(PDEVH)
 	$(GLCC) $(GLO_)gdev4693.$(OBJ) $(C_) $(GLSRC)gdev4693.c
 
 ### -------------------- Tektronix ink-jet printers -------------------- ###
@@ -683,10 +753,10 @@ $(GLOBJ)gdev4693.$(OBJ): $(GLSRC)gdev4693.c $(PDEVH)
 ###       Karsten Spang (spang@nbivax.nbi.dk) if you have questions.     ###
 
 tek4696_=$(GLOBJ)gdevtknk.$(OBJ)
-tek4696.dev: $(tek4696_) page.dev
-	$(SETPDEV) tek4696 $(tek4696_)
+$(DD)tek4696.dev : $(tek4696_) $(DD)page.dev
+	$(SETPDEV) $(DD)tek4696 $(tek4696_)
 
-$(GLOBJ)gdevtknk.$(OBJ): $(GLSRC)gdevtknk.c $(PDEVH) $(malloc__h)
+$(GLOBJ)gdevtknk.$(OBJ) : $(GLSRC)gdevtknk.c $(PDEVH) $(malloc__h)
 	$(GLCC) $(GLO_)gdevtknk.$(OBJ) $(C_) $(GLSRC)gdevtknk.c
 
 ### ----------------- The Xerox XES printer device --------------------- ###
@@ -694,10 +764,10 @@ $(GLOBJ)gdevtknk.$(OBJ): $(GLSRC)gdevtknk.c $(PDEVH) $(malloc__h)
 ###       Peter Flass (flass@lbdrscs.bitnet) if you have questions.      ###
 
 xes_=$(GLOBJ)gdevxes.$(OBJ)
-xes.dev: $(xes_) page.dev
-	$(SETPDEV) xes $(xes_)
+$(DD)xes.dev : $(xes_) $(DD)page.dev
+	$(SETPDEV) $(DD)xes $(xes_)
 
-$(GLOBJ)gdevxes.$(OBJ): $(GLSRC)gdevxes.c $(PDEVH)
+$(GLOBJ)gdevxes.$(OBJ) : $(GLSRC)gdevxes.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevxes.$(OBJ) $(C_) $(GLSRC)gdevxes.c
 
 ###### ------------------------- Fax devices ------------------------- ######
@@ -711,15 +781,15 @@ $(GLOBJ)gdevxes.$(OBJ): $(GLSRC)gdevxes.c $(PDEVH)
 
 dfax_=$(GLOBJ)gdevdfax.$(OBJ)
 
-dfaxlow.dev: $(dfax_) tfax.dev
-	$(SETDEV) dfaxlow $(dfax_)
-	$(ADDMOD) dfaxlow -include tfax
+$(DD)dfaxlow.dev : $(dfax_) $(DD)tfax.dev
+	$(SETDEV) $(DD)dfaxlow $(dfax_)
+	$(ADDMOD) $(GLGEN)dfaxlow -include $(DD)tfax
 
-dfaxhigh.dev: $(dfax_) tfax.dev
-	$(SETDEV) dfaxhigh $(dfax_)
-	$(ADDMOD) dfaxhigh -include tfax
+$(DD)dfaxhigh.dev : $(dfax_) $(DD)tfax.dev
+	$(SETDEV) $(DD)dfaxhigh $(dfax_)
+	$(ADDMOD) $(GLGEN)dfaxhigh -include $(DD)tfax
 
-$(GLOBJ)gdevdfax.$(OBJ): $(GLSRC)gdevdfax.c $(PDEVH) $(scfx_h) $(strimpl_h)
+$(GLOBJ)gdevdfax.$(OBJ) : $(GLSRC)gdevdfax.c $(PDEVH) $(scfx_h) $(strimpl_h)
 	$(GLCC) $(GLO_)gdevdfax.$(OBJ) $(C_) $(GLSRC)gdevdfax.c
 
 ###### --------------------- Raster file formats --------------------- ######
@@ -729,10 +799,10 @@ $(GLOBJ)gdevdfax.$(OBJ): $(GLSRC)gdevdfax.c $(PDEVH) $(scfx_h) $(strimpl_h)
 ###       Frederic Petrot (petrot@masi.ibp.fr) if you have questions.    ###
 
 cif_=$(GLOBJ)gdevcif.$(OBJ)
-cif.dev: $(cif_) page.dev
-	$(SETPDEV) cif $(cif_)
+$(DD)cif.dev : $(cif_) $(DD)page.dev
+	$(SETPDEV) $(DD)cif $(cif_)
 
-$(GLOBJ)gdevcif.$(OBJ): $(GLSRC)gdevcif.c $(PDEVH)
+$(GLOBJ)gdevcif.$(OBJ) : $(GLSRC)gdevcif.c $(PDEVH)
 	$(GLCC) $(GLO_)gdevcif.$(OBJ) $(C_) $(GLSRC)gdevcif.c
 
 ### ------------------------- Inferno bitmaps -------------------------- ###
@@ -740,10 +810,11 @@ $(GLOBJ)gdevcif.$(OBJ): $(GLSRC)gdevcif.c $(PDEVH)
 ###       Russ Cox <rsc@plan9.bell-labs.com> if you have questions.      ###
 
 inferno_=$(GLOBJ)gdevifno.$(OBJ)
-inferno.dev: $(inferno_) page.dev
-	$(SETPDEV) inferno $(inferno_)
+$(DD)inferno.dev : $(inferno_) $(DD)page.dev
+	$(SETPDEV) $(DD)inferno $(inferno_)
 
-$(GLOBJ)gdevifno.$(OBJ): $(GLSRC)gdevifno.c $(PDEVH) $(gxlum_h)
+$(GLOBJ)gdevifno.$(OBJ) : $(GLSRC)gdevifno.c $(PDEVH)\
+ $(gsparam_h) $(gxlum_h)
 	$(GLCC) $(GLO_)gdevifno.$(OBJ) $(C_) $(GLSRC)gdevifno.c
 
 ### --------------------------- MGR devices ---------------------------- ###
@@ -752,33 +823,48 @@ $(GLOBJ)gdevifno.$(OBJ): $(GLSRC)gdevifno.c $(PDEVH) $(gxlum_h)
 
 MGR=$(GLOBJ)gdevmgr.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
 
-$(GLOBJ)gdevmgr.$(OBJ): $(GLSRC)gdevmgr.c $(PDEVH)\
- $(gdevpccm_h) $(GLSRC)gdevmgr.h
+gdevmgr_h= $(GLSRC)gdevmgr.h
+
+$(GLOBJ)gdevmgr.$(OBJ) : $(GLSRC)gdevmgr.c $(PDEVH)\
+ $(gdevmgr_h) $(gdevpccm_h)
 	$(GLCC) $(GLO_)gdevmgr.$(OBJ) $(C_) $(GLSRC)gdevmgr.c
 
-mgrmono.dev: $(MGR) page.dev
-	$(SETPDEV) mgrmono $(MGR)
+$(DD)mgrmono.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgrmono $(MGR)
 
-mgrgray2.dev: $(MGR) page.dev
-	$(SETPDEV) mgrgray2 $(MGR)
+$(DD)mgrgray2.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgrgray2 $(MGR)
 
-mgrgray4.dev: $(MGR) page.dev
-	$(SETPDEV) mgrgray4 $(MGR)
+$(DD)mgrgray4.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgrgray4 $(MGR)
 
-mgrgray8.dev: $(MGR) page.dev
-	$(SETPDEV) mgrgray8 $(MGR)
+$(DD)mgrgray8.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgrgray8 $(MGR)
 
-mgr4.dev: $(MGR) page.dev
-	$(SETPDEV) mgr4 $(MGR)
+$(DD)mgr4.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgr4 $(MGR)
 
-mgr8.dev: $(MGR) page.dev
-	$(SETPDEV) mgr8 $(MGR)
+$(DD)mgr8.dev : $(MGR) $(DD)page.dev
+	$(SETPDEV) $(DD)mgr8 $(MGR)
 
 ### -------------------------- SGI RGB pixmaps -------------------------- ###
 
 sgirgb_=$(GLOBJ)gdevsgi.$(OBJ)
-sgirgb.dev: $(sgirgb_) page.dev
-	$(SETPDEV) sgirgb $(sgirgb_)
+$(DD)sgirgb.dev : $(sgirgb_) $(DD)page.dev
+	$(SETPDEV) $(DD)sgirgb $(sgirgb_)
 
-$(GLOBJ)gdevsgi.$(OBJ): $(GLSRC)gdevsgi.c $(PDEVH) $(GLSRC)gdevsgi.h
+gdevsgi_h=$(GLSRC)gdevsgi.h
+
+$(GLOBJ)gdevsgi.$(OBJ) : $(GLSRC)gdevsgi.c $(PDEVH) $(gdevsgi_h)
 	$(GLCC) $(GLO_)gdevsgi.$(OBJ) $(C_) $(GLSRC)gdevsgi.c
+
+### ---------------- Sun raster files ---------------- ###
+
+sunr_=$(GLOBJ)gdevsunr.$(OBJ)
+
+# Harlequin variant, 1-bit
+$(DD)sunhmono.dev : $(sunr_) $(DD)page.dev
+	$(SETPDEV) $(DD)sunhmono $(sunr_)
+
+$(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevsunr.$(OBJ) $(C_) $(GLSRC)gdevsunr.c