[gs-cvs] rev 8357 - in trunk/gs: doc src
giles at ghostscript.com
giles at ghostscript.com
Fri Nov 9 13:18:05 PST 2007
Author: giles
Date: 2007-11-09 13:18:04 -0800 (Fri, 09 Nov 2007)
New Revision: 8357
Modified:
trunk/gs/doc/Make.htm
trunk/gs/src/Makefile.in
trunk/gs/src/bcwin32.mak
trunk/gs/src/dvx-gcc.mak
trunk/gs/src/gs.mak
trunk/gs/src/jpeg.mak
trunk/gs/src/macos-mcp.mak
trunk/gs/src/macosx.mak
trunk/gs/src/msvc32.mak
trunk/gs/src/msvclib.mak
trunk/gs/src/openvms.mak
trunk/gs/src/openvms.mmk
trunk/gs/src/os2.mak
trunk/gs/src/ugcclib.mak
trunk/gs/src/unix-gcc.mak
trunk/gs/src/unixansi.mak
trunk/gs/src/watclib.mak
trunk/gs/src/watcw32.mak
Log:
Remove the JVERSION makefile variable.
We only support the current version 6 library, and it seems
unlikely to revise in the the near future. We also include
our own copy of the source now, so it is less important to
support a variety of third party library versions.
Modified: trunk/gs/doc/Make.htm
===================================================================
--- trunk/gs/doc/Make.htm 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/doc/Make.htm 2007-11-09 21:18:04 UTC (rev 8357)
@@ -558,11 +558,7 @@
<b><tt>DEVICE_DEVS</tt></b> options. These are described in
<b><tt>devs.mak</tt></b> and <b><tt>contrib.mak</tt></b>, even though the
file that must be edited to select them is the <a
-href="#Platform-specific_makefiles">platform-specific makefile</a>. Check
-also the <b><tt>JVERSION</tt></b> macro in
-the platform-specific makefile, and adjust them if they don't match the
-JPEG library version you're using: see <b><tt>jpeg.mak</tt></b>
-for more information.
+href="#Platform-specific_makefiles">platform-specific makefile</a>.
<p>
Some platform-specific options are described in the sections for individual
Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/Makefile.in 2007-11-09 21:18:04 UTC (rev 8357)
@@ -158,7 +158,6 @@
# See jpeg.mak for more information.
JSRCDIR=@LIBJPEGDIR@
-JVERSION=6
# Note: if a shared library is used, it may not contain the
# D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
Modified: trunk/gs/src/bcwin32.mak
===================================================================
--- trunk/gs/src/bcwin32.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/bcwin32.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -153,7 +153,6 @@
!ifndef JSRCDIR
JSRCDIR=jpeg
-JVERSION=6
!endif
# Define the directory where the PNG library sources are stored,
Modified: trunk/gs/src/dvx-gcc.mak
===================================================================
--- trunk/gs/src/dvx-gcc.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/dvx-gcc.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -104,7 +104,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Note: if a shared library is used, it may not contain the
# D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
Modified: trunk/gs/src/gs.mak
===================================================================
--- trunk/gs/src/gs.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/gs.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -36,7 +36,6 @@
# at run time.
# JSRCDIR - the directory where the IJG JPEG library source code
# is stored (at compilation time).
-# JVERSION - the major version number of the IJG JPEG library.
# PNGSRCDIR - the same for libpng.
# ZSRCDIR - the same for zlib.
# SHARE_JPEG - normally 0; if set to 1, asks the linker to use
Modified: trunk/gs/src/jpeg.mak
===================================================================
--- trunk/gs/src/jpeg.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/jpeg.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 Artifex Software, Inc.
+# Copyright (C) 2001-2007 Artifex Software, Inc.
# All Rights Reserved.
#
# This software is provided AS-IS with no warranty, either express or
@@ -17,8 +17,6 @@
# JSRCDIR - the source directory
# JGENDIR - the generated intermediate file directory
# JOBJDIR - the object directory
-# JVERSION - the library major version number (currently "6",
-# "6b", "62" and "6a" are also supported)
# SHARE_JPEG - 0 to compile the library, 1 to share
# JPEG_NAME - if SHARE_JPEG = 1, the name of the shared library
#
@@ -200,11 +198,6 @@
$(JGEN)jpege_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE)
$(SETMOD) $(JGEN)jpege_1 -lib $(JPEG_NAME)
-# we actually ignore the setting of JVERSION here, which could be used
-# to substitute for jpeg[ed]6.dev to handle differences. However, the
-# build requirements for all supported versions are identical, and
-# new versions are unlikely to be different. We therefore treat all
-# subversions the same.
$(JGEN)jpege_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege6.dev
$(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev
Modified: trunk/gs/src/macos-mcp.mak
===================================================================
--- trunk/gs/src/macos-mcp.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/macos-mcp.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -102,7 +102,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Define the directory where the PNG library sources are stored,
# and the version of the library that is stored there.
Modified: trunk/gs/src/macosx.mak
===================================================================
--- trunk/gs/src/macosx.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/macosx.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -137,7 +137,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Note: if a shared library is used, it may not contain the
# D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/msvc32.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -188,7 +188,6 @@
!ifndef JSRCDIR
JSRCDIR=jpeg
-JVERSION=6
!endif
# Define the directory where the PNG library sources are stored,
Modified: trunk/gs/src/msvclib.mak
===================================================================
--- trunk/gs/src/msvclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/msvclib.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -121,7 +121,6 @@
!ifndef JSRCDIR
JSRCDIR=jpeg
-JVERSION=6
!endif
# Define the directory where the PNG library sources are stored,
Modified: trunk/gs/src/openvms.mak
===================================================================
--- trunk/gs/src/openvms.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/openvms.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -116,7 +116,6 @@
# See jpeg.mak for more information.
JSRCDIR=[.jpeg]
-JVERSION=6
# Define the directory where the PNG library sources are stored,
# and the version of the library that is stored there.
Modified: trunk/gs/src/openvms.mmk
===================================================================
--- trunk/gs/src/openvms.mmk 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/openvms.mmk 2007-11-09 21:18:04 UTC (rev 8357)
@@ -125,7 +125,6 @@
.else
JSRCDIR=[--.jpeg]
.endif
-JVERSION=6
# Define the directory where the PNG library sources are stored,
# and the version of the library that is stored there.
Modified: trunk/gs/src/os2.mak
===================================================================
--- trunk/gs/src/os2.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/os2.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -116,7 +116,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Define the directory where the PNG library sources are stored,
# and the version of the library that is stored there.
Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/ugcclib.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -42,8 +42,6 @@
PGRELDIR=.
JSRCDIR=jpeg
-JVERSION=6
-
SHARE_JPEG=0
JPEG_NAME=jpeg
Modified: trunk/gs/src/unix-gcc.mak
===================================================================
--- trunk/gs/src/unix-gcc.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/unix-gcc.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -135,7 +135,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Note: if a shared library is used, it may not contain the
# D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
Modified: trunk/gs/src/unixansi.mak
===================================================================
--- trunk/gs/src/unixansi.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/unixansi.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -120,7 +120,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Note: if a shared library is used, it may not contain the
# D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
Modified: trunk/gs/src/watclib.mak
===================================================================
--- trunk/gs/src/watclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/watclib.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -56,9 +56,6 @@
!ifndef JSRCDIR
JSRCDIR=jpeg
!endif
-!ifndef JVERSION
-JVERSION=6
-!endif
!ifndef PNGSRCDIR
PNGSRCDIR=libpng
Modified: trunk/gs/src/watcw32.mak
===================================================================
--- trunk/gs/src/watcw32.mak 2007-11-09 21:15:56 UTC (rev 8356)
+++ trunk/gs/src/watcw32.mak 2007-11-09 21:18:04 UTC (rev 8357)
@@ -105,7 +105,6 @@
# See jpeg.mak for more information.
JSRCDIR=jpeg
-JVERSION=6
# Define the directory where the PNG library sources are stored,
# and the version of the library that is stored there.
More information about the gs-cvs
mailing list