[gs-cvs] rev 7994 - trunk/gs/src
giles at ghostscript.com
giles at ghostscript.com
Mon May 21 15:08:08 PDT 2007
Author: giles
Date: 2007-05-21 15:08:07 -0700 (Mon, 21 May 2007)
New Revision: 7994
Modified:
trunk/gs/src/Makefile.in
trunk/gs/src/bcwin32.mak
trunk/gs/src/devs.mak
trunk/gs/src/dvx-gcc.mak
trunk/gs/src/gs.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/os2.mak
trunk/gs/src/ugcclib.mak
trunk/gs/src/unix-gcc.mak
trunk/gs/src/unixansi.mak
trunk/gs/src/watclib.mak
Log:
Define IMDISRCDIR in the top level makefiles and pass this through to
the compile lines in devs.mak. This the the correct fix for the issue
addressed in revisions 7970 and 7971.
Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/Makefile.in 2007-05-21 22:08:07 UTC (rev 7994)
@@ -205,6 +205,11 @@
IJSSRCDIR=@IJSDIR@
IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information.
+
+IMDISRCDIR=imdi
+
# Define how to build the library archives. (These are not used in any
# standard configuration.)
Modified: trunk/gs/src/bcwin32.mak
===================================================================
--- trunk/gs/src/bcwin32.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/bcwin32.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -175,6 +175,10 @@
IJSEXECTYPE=win
!endif
+!ifndef IMDISRCDIR
+IMDISRCDIR=imdi
+!endif
+
# Define any other compilation flags.
!ifndef CFLAGS
Modified: trunk/gs/src/devs.mak
===================================================================
--- trunk/gs/src/devs.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/devs.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -1496,16 +1496,15 @@
### IMDI from Argyll
-IMDISRC=imdi
-IMDISRCDIR=$(IMDISRC)$(D)
+IMDISRC=$(IMDISRCDIR)$(D)
simdi_=$(GLOBJ)imdi.$(OBJ) $(GLOBJ)imdi_tab.$(OBJ)
-$(GLOBJ)imdi.$(OBJ) : $(IMDISRCDIR)imdi.c
- $(GLCC) $(GLO_)imdi.$(OBJ) $(C_) $(IMDISRCDIR)imdi.c
+$(GLOBJ)imdi.$(OBJ) : $(IMDISRC)imdi.c
+ $(GLCC) $(GLO_)imdi.$(OBJ) $(C_) $(IMDISRC)imdi.c
-$(GLOBJ)imdi_tab.$(OBJ) : $(IMDISRCDIR)imdi_tab.c
- $(GLCC) $(GLO_)imdi_tab.$(OBJ) $(C_) $(IMDISRCDIR)/imdi_tab.c
+$(GLOBJ)imdi_tab.$(OBJ) : $(IMDISRC)imdi_tab.c
+ $(GLCC) $(GLO_)imdi_tab.$(OBJ) $(C_) $(IMDISRC)imdi_tab.c
$(DD)simdi.dev : $(DEVS_MAK) $(simdi_)
$(SETMOD) $(DD)simdi $(simdi_)
@@ -1516,7 +1515,7 @@
$(GLOBJ)gdevwts.$(OBJ) : $(GLSRC)gdevwts.c $(PDEVH)\
$(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h)
- $(GLICCCC) -I$(IMDISRC) $(GLO_)gdevwts.$(OBJ) $(C_) $(GLSRC)gdevwts.c
+ $(GLICCCC) -I$(IMDISRCDIR) $(GLO_)gdevwts.$(OBJ) $(C_) $(GLSRC)gdevwts.c
$(DD)wtscmyk.dev : $(DEVS_MAK) $(wts_) $(GLD)page.dev
$(SETPDEV2) $(DD)wtscmyk $(wts_)
Modified: trunk/gs/src/dvx-gcc.mak
===================================================================
--- trunk/gs/src/dvx-gcc.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/dvx-gcc.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -164,7 +164,10 @@
#IJSSRCDIR=ijs
#IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+IMDISRCDIR=imdi
# ------ Platform-specific options ------ #
Modified: trunk/gs/src/gs.mak
===================================================================
--- trunk/gs/src/gs.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/gs.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -70,6 +70,8 @@
# to properly compile in the jpeg2k library source
# ICCSRCDIR - the name of the ICC lib source dir, currently
# always icclib (compiled in statically)
+# IMDISRCDIR - the name of the IMDI lib source directory
+# generally 'imdi'
# DEVICE_DEVS - the devices to include in the executable.
# See devs.mak for details.
# DEVICE_DEVS1...DEVICE_DEVS21 - additional devices, if the definition
Modified: trunk/gs/src/macos-mcp.mak
===================================================================
--- trunk/gs/src/macos-mcp.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/macos-mcp.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -145,6 +145,11 @@
#IJSSRCDIR=ijs
#IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
# ------ Platform-specific options ------ #
# Define the name of the C compiler.
Modified: trunk/gs/src/macosx.mak
===================================================================
--- trunk/gs/src/macosx.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/macosx.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -194,6 +194,11 @@
IJSSRCDIR=ijs
IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
# Define how to build the library archives. (These are not used in any
# standard configuration.)
Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/msvc32.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -283,6 +283,13 @@
IJSEXECTYPE=win
!endif
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+!ifndef IMDISRCDIR
+IMDISRCDIR=imdi
+!endif
+
# Define any other compilation flags.
!ifndef CFLAGS
Modified: trunk/gs/src/msvclib.mak
===================================================================
--- trunk/gs/src/msvclib.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/msvclib.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -181,6 +181,13 @@
ICCSRCDIR=icclib
!endif
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+!ifndef IMDISRCDIR
+IMDISRCDIR=imdi
+!endif
+
# Define any other compilation flags.
!ifndef CFLAGS
Modified: trunk/gs/src/os2.mak
===================================================================
--- trunk/gs/src/os2.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/os2.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -159,6 +159,11 @@
#IJSSRCDIR=ijs
#IJSEXECTYPE=win
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
# 1 --> Use 64 bits for gx_color_index. This is required only for
# non standard devices or DeviceN process color model devices.
USE_LARGE_COLOR_INDEX=1
Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/ugcclib.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -72,6 +72,11 @@
IJSSRCDIR=ijs
IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
# Define how to build the library archives. (These are not used in any
# standard configuration.)
Modified: trunk/gs/src/unix-gcc.mak
===================================================================
--- trunk/gs/src/unix-gcc.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/unix-gcc.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -194,6 +194,11 @@
# Define how to build the library archives. (These are not used in any
# standard configuration.)
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
AR=ar
ARFLAGS=qc
RANLIB=ranlib
Modified: trunk/gs/src/unixansi.mak
===================================================================
--- trunk/gs/src/unixansi.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/unixansi.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -179,6 +179,11 @@
IJSSRCDIR=ijs
IJSEXECTYPE=unix
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+IMDISRCDIR=imdi
+
# Define how to build the library archives. (These are not used in any
# standard configuration.)
Modified: trunk/gs/src/watclib.mak
===================================================================
--- trunk/gs/src/watclib.mak 2007-05-21 15:11:52 UTC (rev 7993)
+++ trunk/gs/src/watclib.mak 2007-05-21 22:08:07 UTC (rev 7994)
@@ -101,6 +101,13 @@
IJSEXECTYPE=win
!endif
+# Define the directory where the imdi library source is stored.
+# See devs.mak for more information
+
+!ifndef IMDISRCDIR
+IMDISRCDIR=imdi
+!endif
+
CFLAGS=
!ifndef WCVERSION
More information about the gs-cvs
mailing list