[gs-cvs] rev 8798 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2008-06-21 23:43:28 -0700 (Sat, 21 Jun 2008)
New Revision: 8798

Modified:
   trunk/gs/src/Makefile.in
   trunk/gs/src/devs.mak
   trunk/gs/src/gdevsvg.c
Log:
Rename the svg device to svgwrite to avoid conflict with the SVG interpreter.

The device is still selected as -sDEVICE=svg, just the name used internally
has been changed.


Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in	2008-06-21 14:06:00 UTC (rev 8797)
+++ trunk/gs/src/Makefile.in	2008-06-22 06:43:28 UTC (rev 8798)
@@ -439,7 +439,7 @@
 DEVICE_DEVS5=@OMNIDEVS@
 DEVICE_DEVS6=@PNGDEVS@
 DEVICE_DEVS7=@JBIG2DEVS@
-DEVICE_DEVS8=$(DD)svg.dev
+DEVICE_DEVS8=$(DD)svgwrite.dev
 DEVICE_DEVS9=
 DEVICE_DEVS10=
 DEVICE_DEVS11=

Modified: trunk/gs/src/devs.mak
===================================================================
--- trunk/gs/src/devs.mak	2008-06-21 14:06:00 UTC (rev 8797)
+++ trunk/gs/src/devs.mak	2008-06-22 06:43:28 UTC (rev 8798)
@@ -1098,10 +1098,10 @@
 
 # Scalable Vector Graphics (SVG) output device
 
-svg_=$(GLOBJ)gdevsvg.$(OBJ)
-$(DD)svg.dev : $(DEVS_MAK) $(svg_) $(GDEV) $(GLD)vector.dev
-	$(SETDEV2) $(DD)svg $(svg_)
-	$(ADDMOD) $(DD)svg -include $(GLD)vector
+svgwrite_=$(GLOBJ)gdevsvg.$(OBJ)
+$(DD)svgwrite.dev : $(DEVS_MAK) $(svgwrite_) $(GDEV) $(GLD)vector.dev
+	$(SETDEV2) $(DD)svgwrite $(svgwrite_)
+	$(ADDMOD) $(DD)svgwrite -include $(GLD)vector
 
 $(GLOBJ)gdevsvg.$(OBJ) : $(GLSRC)gdevsvg.c $(gx_h) $(gdevvec_h)
 	$(GLCC) $(GLO_)gdevsvg.$(OBJ) $(C_) $(GLSRC)gdevsvg.c

Modified: trunk/gs/src/gdevsvg.c
===================================================================
--- trunk/gs/src/gdevsvg.c	2008-06-21 14:06:00 UTC (rev 8797)
+++ trunk/gs/src/gdevsvg.c	2008-06-22 06:43:28 UTC (rev 8798)
@@ -125,7 +125,10 @@
                                gx_device_finalize, 
 			       st_device_vector);
 
-const gx_device_svg gs_svg_device = {
+/* The output device is named 'svg' but we're referred to as the
+   'svgwrite' device by the build system to avoid conflicts with
+   the svg interpreter */
+const gx_device_svg gs_svgwrite_device = {
     svg_device_body("svg", 24),
     svg_device_procs
 };