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

[giles at ghostscript.com]

Author: giles
Date: 2007-10-17 17:36:37 -0700 (Wed, 17 Oct 2007)
New Revision: 8301

Modified:
   trunk/gs/src/jasper.mak
Log:
Remove a spurious CFLAGS instance from the jasper compile line.

DETAILS:

The definition of CC_ passed from the top level makefile should
already include a copy of the CFLAGS for environment overrides,
so the duplicate copy here was unnecessary.

Furthermore, the second expansion of CFLAGS at the end of the
compiler command line could result in picking up a version of
the jasper headers installed elsewhere in the system instead
of the copy in JASSRC, causing the build to fail on undefined
preprocessor symbols, since upstream doesn't have our error
reporting callback.


Modified: trunk/gs/src/jasper.mak
===================================================================
--- trunk/gs/src/jasper.mak	2007-10-18 00:05:55 UTC (rev 8300)
+++ trunk/gs/src/jasper.mak	2007-10-18 00:36:37 UTC (rev 8301)
@@ -1,4 +1,4 @@
-#  Copyright (C) 2004-2006 Artifex Software, Inc.
+#  Copyright (C) 2004-2007 Artifex Software, Inc.
 #  All Rights Reserved.
 #
 #  This software is provided AS-IS with no warranty, either express or
@@ -159,7 +159,7 @@
         $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
 
 # define our specific compiler
-JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) $(CFLAGS)
+JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
 JASO_=$(O_)$(JASOBJ)
 
 # switch in the selected .dev