summaryrefslogtreecommitdiff
path: root/base/expat.mak
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2018-03-27 16:16:49 +0100
committerChris Liddell <chris.liddell@artifex.com>2018-03-29 13:44:03 +0100
commitd8a919d4b45097a527f6f39d509b920d285d709b (patch)
treebd3db4ec1afbd17fe1c95d1087e81674e3fd2372 /base/expat.mak
parent003c4211a019eb5c4719860f353777e177553490 (diff)
downloadghostpdl-d8a919d4b45097a527f6f39d509b920d285d709b.tar.gz
Update expat to 2.2.5
With a couple of tweaks to base/expat.mak to make it work.
Diffstat (limited to 'base/expat.mak')
-rw-r--r--base/expat.mak9
1 files changed, 7 insertions, 2 deletions
diff --git a/base/expat.mak b/base/expat.mak
index fe6ba9537..9186a521b 100644
--- a/base/expat.mak
+++ b/base/expat.mak
@@ -31,7 +31,8 @@ EXPATGEN=$(EXPATGENDIR)$(D)
EXPATOBJ=$(EXPATOBJDIR)$(D)
EXPATO_=$(O_)$(EXPATOBJ)
-EXPATCC=$(CC) $(CFLAGS) $(I_)$(EXPATSRC)lib$(_I) $(EXPAT_CFLAGS)
+EXPATCC=$(CC) $(CFLAGS) $(I_)$(EXPATSRC)lib$(_I) \
+$(D_)XML_POOR_ENTROPY$(_D) $(EXPAT_CFLAGS)
expat.clean : expat.config-clean expat.clean-not-config-clean
@@ -46,7 +47,8 @@ expat.config-clean :
expat_=$(EXPATOBJ)xmlparse.$(OBJ) \
$(EXPATOBJ)xmltok.$(OBJ) \
- $(EXPATOBJ)xmlrole.$(OBJ)
+ $(EXPATOBJ)xmlrole.$(OBJ) \
+ $(EXPATOBJ)loadlibrary.$(OBJ)
expat_xmlparse_hdrs=$(EXPATSRC)expat.h \
$(EXPATSRC)xmlrole.h \
@@ -79,6 +81,9 @@ $(EXPATOBJ)xmlrole.$(OBJ) : $(EXPATSRC)xmlrole.c $(expat_xmlrole_hdrs) $(EXPAT_M
$(EXPATOBJ)xmltok.$(OBJ) : $(EXPATSRC)xmltok.c $(expat_xmltok_hdrs) $(EXPAT_MAK) $(MAKEDIRS)
$(EXPATCC) $(EXPATO_)xmltok.$(OBJ) $(C_) $(EXPATSRC)xmltok.c
+$(EXPATOBJ)loadlibrary.$(OBJ) : $(EXPATSRC)loadlibrary.c $(expat_xmltok_hdrs) $(EXPAT_MAK) $(MAKEDIRS)
+ $(EXPATCC) $(EXPATO_)loadlibrary.$(OBJ) $(C_) $(EXPATSRC)loadlibrary.c
+
# Copy the target definition we want
$(EXPATGEN)expat.dev : $(EXPAT_MAK) \
$(EXPATGEN)expat_$(SHARE_EXPAT).dev $(MAKEDIRS)