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

[giles at ghostscript.com]

Author: giles
Date: 2007-11-13 18:22:53 -0800 (Tue, 13 Nov 2007)
New Revision: 8363

Modified:
   trunk/gs/src/expat.mak
Log:
Add support for passing EXPAT_CFLAGS from the top-level makefile.
Passing -DHAVE_MEMMOVE is required in the unix build.


Modified: trunk/gs/src/expat.mak
===================================================================
--- trunk/gs/src/expat.mak	2007-11-14 02:06:05 UTC (rev 8362)
+++ trunk/gs/src/expat.mak	2007-11-14 02:22:53 UTC (rev 8363)
@@ -15,10 +15,11 @@
 #
 # Users of this makefile must define the following:
 #	SHARE_EXPAT - 1 to link a system (shared) library
-#		      0 to compile in the referenced source, 
-#	EXPATSRCDIR - the expat source top-level directory
-#	EXPATGENDIR - directory for intermediate generated files
-#	EXPATOBJDIR - directory for object files
+#		      0 to compile in the referenced source,
+#	EXPAT_CFLAGS - Compiler flags for building the source,
+#	EXPATSRCDIR - the expat source top-level directory,
+#	EXPATGENDIR - directory for intermediate generated files,
+#	EXPATOBJDIR - directory for object files.
 
 # Define the name of this makefile
 EXPAT_MAK=$(GLSRC)expat.mak
@@ -29,7 +30,7 @@
 EXPATOBJ=$(EXPATOBJDIR)$(D)
 EXPATO_=$(O_)$(EXPATOBJ)
 
-EXPATCC=$(CC_) $(I_)$(EXPATSRC)lib$(_I)
+EXPATCC=$(CC_) $(I_)$(EXPATSRC)lib$(_I) $(EXPAT_CFLAGS)
 
 expat.clean : expat.config-clean expat.clean-not-config-clean
 
@@ -52,7 +53,7 @@
 
 expat_xmlrole_hdrs=$(EXPATSRC)ascii.h \
 	$(EXPATSRC)xmlrole.h \
-	$(EXPATSRC)expat_internal.h \
+	$(EXPATSRC)expat_external.h \
 	$(EXPATSRC)internal.h
 
 expat_xmltok_hdrs=$(EXPATSRC)xmltok_impl.c \
@@ -62,10 +63,10 @@
 	$(EXPATSRC)iasciitab.h \
 	$(EXPATSRC)latin1tab.h \
 	$(EXPATSRC)nametab.h \
-	$(EXPATSRC)uft8tab.h \
+	$(EXPATSRC)utf8tab.h \
 	$(EXPATSRC)xmltok.h \
 	$(EXPATSRC)xmltok_impl.h \
-	$(EXPATSRC)expat_internal.h \
+	$(EXPATSRC)expat_external.h \
 	$(EXPATSRC)internal.h
 
 $(EXPATOBJ)xmlparse.$(OBJ) : $(EXPATSRC)xmlparse.c $(expat_xmlparse_hdrs)