[gs-cvs] gs/src

[Ralph Giles]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv32142

Modified Files:
	devs.mak int.mak lib.mak 
Log Message:
Corrects various include dependency problems. Closes SourceForge Bug #604884.


Index: devs.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/devs.mak,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- devs.mak	16 Oct 2002 07:43:46 -0000	1.78
+++ devs.mak	22 Oct 2002 16:47:30 -0000	1.79
@@ -888,7 +888,7 @@
 pdxtext_xyz=
 pdxtext_=$(pdxtext_ab) $(pdxtext_cde) $(pdxtext_fgh) $(pdxtext_ijk)\
  $(pdxtext_lmn) $(pdxtext_opq) $(pdxtext_rst) $(pdxtext_uvw) $(pdxtext_xyz)\
- $(pdftext10_) $(GLOBJ)gsfont0c.$(OBJ)
+ $(GLOBJ)gsfont0c.$(OBJ)
 $(DD)pdxtext.dev : $(DEVS_MAK) $(ECHOGS_MAK) $(pdxtext_)\
  $(GLD)fcopy.dev $(GLD)psf.dev
 	$(SETMOD) $(DD)pdxtext $(pdxtext_ab)
@@ -900,7 +900,6 @@
 	$(ADDMOD) $(DD)pdxtext $(pdxtext_rst)
 	$(ADDMOD) $(DD)pdxtext $(pdxtext_uvw)
 	$(ADDMOD) $(DD)pdxtext $(pdxtext_xyz)
-	$(ADDMOD) $(DD)pdxtext $(pdftext10_)
 	$(ADDMOD) $(DD)pdxtext $(GLOBJ)gsfont0c.$(OBJ)
 	$(ADDMOD) $(DD)pdxtext -include $(GLD)fcopy $(GLD)psf
 
@@ -949,7 +948,7 @@
 	$(GLCC) $(GLO_)gdevpdts.$(OBJ) $(C_) $(GLSRC)gdevpdts.c
 
 $(GLOBJ)gdevpdtt.$(OBJ) : $(GLSRC)gdevpdtt.c $(gx_h) $(math__h) $(string__h)\
- $(gserrors_h) $(gsfcache_h) $(gxfont_h) $(gxfont0_h) $(gxfcid_h) $(gxfcopy_h)\
+ $(gserrors_h) $(gxfcache_h) $(gxfont_h) $(gxfont0_h) $(gxfcid_h) $(gxfcopy_h)\
  $(gxfcmap_h) $(gxpath_h) $(gdevpdfx_h) $(gdevpdfg_h)\
  $(gdevpdtx_h) $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) $(gdevpdtt_h)
 	$(GLCC) $(GLO_)gdevpdtt.$(OBJ) $(C_) $(GLSRC)gdevpdtt.c

Index: int.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/int.mak,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- int.mak	4 Oct 2002 23:43:38 -0000	1.84
+++ int.mak	22 Oct 2002 16:47:30 -0000	1.85
@@ -77,7 +77,7 @@
 store_h=$(PSSRC)store.h $(ialloc_h) $(idosave_h)
 iplugin_h=$(PSSRC)iplugin.h
 ifapi_h=$(PSSRC)ifapi.h $(iplugin_h)
-zht_h=$(PSSRC)zht2.h $(gscspace_h)
+zht2_h=$(PSSRC)zht2.h $(gscspace_h)
 
 GH=$(AK) $(ghost_h)
 

Index: lib.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/lib.mak,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- lib.mak	22 Oct 2002 13:31:37 -0000	1.103
+++ lib.mak	22 Oct 2002 16:47:30 -0000	1.104
@@ -1,4 +1,4 @@
-#    Copyright (C) 1995, 2000 Aladdin Enterprises.  All rights reserved.
+#    Copyright (C) 1995-2002 artofcode LLC. All rights reserved.
 # 
 # This software is provided AS-IS with no warranty, either express or
 # implied.
@@ -154,6 +154,7 @@
 gsrect_h=$(GLSRC)gsrect.h $(gxfixed_h)
 gxalloc_h=$(GLSRC)gxalloc.h $(gsalloc_h) $(gxobj_h)
 gxbitops_h=$(GLSRC)gxbitops.h $(gsbitops_h)
+gxcindex_h=$(GLSRC)gxcindex.h $(gsbitops_h)
 
 # Streams
 scommon_h=$(GLSRC)scommon.h $(gsmemory_h) $(gstypes_h) $(gsstype_h)
@@ -314,6 +315,7 @@
 gslib_h=$(GLSRC)gslib.h
 gslparam_h=$(GLSRC)gslparam.h
 gsmatrix_h=$(GLSRC)gsmatrix.h
+gsovrc_h=$(GLSRC)gsovrc.h $(gsstype_h) $(gscompt_h)
 gspaint_h=$(GLSRC)gspaint.h
 gsparam_h=$(GLSRC)gsparam.h $(gsstype_h)
 gsparams_h=$(GLSRC)gsparams.h $(gsparam_h) $(stream_h)
@@ -337,7 +339,6 @@
 gxalpha_h=$(GLSRC)gxalpha.h
 gxbcache_h=$(GLSRC)gxbcache.h $(gxbitmap_h)
 gxbitfmt_h=$(GLSRC)gxbitfmt.h
-gxcindex_h=$(GLSRC)gxcindex.h $(gsbitops_h)
 gxcvalue_h=$(GLSRC)gxcvalue.h
 gxclio_h=$(GLSRC)gxclio.h $(gp_h)
 gxclip_h=$(GLSRC)gxclip.h
@@ -383,6 +384,7 @@
 gxdcolor_h=$(GLSRC)gxdcolor.h\
  $(gscsel_h) $(gsdcolor_h) $(gsropt_h) $(gsstruct_h)
 gscspace_h=$(GLSRC)gscspace.h $(gsmemory_h)
+gscssub_h=$(GLSRC)gscssub.h $(gscspace_h)
 gxdevcli_h=$(GLSRC)gxdevcli.h $(std_h)\
  $(gscompt_h) $(gsdcolor_h) $(gsiparam_h) $(gsmatrix_h)\
  $(gsrefct_h) $(gsropt_h) $(gsstruct_h) $(gstparam_h) $(gsxfont_h)\
@@ -1816,23 +1818,6 @@
  $(gxfont_h) $(gxfont0_h) $(gxfont0c_h) $(gxfcid_h) $(gxfcmap_h)
 	$(GLCC) $(GLO_)gsfont0c.$(OBJ) $(C_) $(GLSRC)gsfont0c.c
 
-# ---------------- Font copying ---------------- #
-
-# This facility is not included in the core library.  Currently it is used
-# only by pdfwrite.
-
-fcopy_=$(GLOBJ)gxfcopy.$(OBJ)
-$(GLD)fcopy.dev : $(DEVS_MAK) $(ECHOGS_MAK) $(fcopy_)
-	$(SETMOD) $(GLD)fcopy $(fcopy_)
-
-$(GLOBJ)gxfcopy.$(OBJ) : $(GLSRC)gxfcopy.c $(memory__h) $(GXERR)\
- $(gscencs_h) $(gsline_h) $(gspaint_h) $(gspath_h) $(gsstruct_h) $(gsutil_h)\
- $(gxfont_h) $(gxfont1_h) $(gxfont42_h) $(gxfcid_h) $(gxfcopy_h)\
- $(gxistate_h) $(gxtext_h) $(gxtype1_h)\
- $(gzstate_h)\
- $(gdevpsf_h) $(stream_h)
-	$(GLCC) $(GLO_)gxfcopy.$(OBJ) $(C_) $(GLSRC)gxfcopy.c
-
 # ---------------- Pattern color ---------------- #
 
 patlib_1=$(GLOBJ)gspcolor.$(OBJ) $(GLOBJ)gsptype1.$(OBJ) $(GLOBJ)gxclip2.$(OBJ)
@@ -2009,6 +1994,23 @@
  $(gdevpsf_h)
 	$(GLCC) $(GLO_)gdevpsfx.$(OBJ) $(C_) $(GLSRC)gdevpsfx.c
 
+# ---------------- Font copying ---------------- #
+
+# This facility is not included in the core library.  Currently it is used
+# only by pdfwrite.
+
+fcopy_=$(GLOBJ)gxfcopy.$(OBJ)
+$(GLD)fcopy.dev : $(DEVS_MAK) $(ECHOGS_MAK) $(fcopy_)
+	$(SETMOD) $(GLD)fcopy $(fcopy_)
+
+$(GLOBJ)gxfcopy.$(OBJ) : $(GLSRC)gxfcopy.c $(memory__h) $(GXERR)\
+ $(gscencs_h) $(gsline_h) $(gspaint_h) $(gspath_h) $(gsstruct_h) $(gsutil_h)\
+ $(gxfont_h) $(gxfont1_h) $(gxfont42_h) $(gxfcid_h) $(gxfcopy_h)\
+ $(gxistate_h) $(gxtext_h) $(gxtype1_h)\
+ $(gzstate_h)\
+ $(gdevpsf_h) $(stream_h)
+	$(GLCC) $(GLO_)gxfcopy.$(OBJ) $(C_) $(GLSRC)gxfcopy.c
+
 # -------- Level 1 color extensions (CMYK color and colorimage) -------- #
 
 cmyklib_=$(GLOBJ)gscolor1.$(OBJ) $(GLOBJ)gsht1.$(OBJ)
@@ -2316,6 +2318,7 @@
 gsipar3x_h=$(GLSRC)gsipar3x.h $(gsiparam_h) $(gsiparm3_h)
 gximag3x_h=$(GLSRC)gximag3x.h $(gsipar3x_h) $(gxiparam_h)
 gxblend_h=$(GLSRC)gxblend.h
+gdevp14_h=$(GLSRC)gdevp14.h
 
 $(GLOBJ)gstrans.$(OBJ) : $(GLSRC)gstrans.c $(GXERR)\
  $(gstrans_h) $(gsutil_h) $(gxdevcli_h) $(gzstate_h)