From 2a0e383c261e830ae5a93b0a8aa58828d382ffde Mon Sep 17 00:00:00 2001
From: "Martin A. Brown" <martin@linux-ip.net>
Date: Fri, 4 Mar 2016 11:46:17 -0800
Subject: [PATCH] run the xinclude first, then validate document

---
 tldp/doctypes/docbook5xml.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tldp/doctypes/docbook5xml.py b/tldp/doctypes/docbook5xml.py
index c13961e..11118e6 100644
--- a/tldp/doctypes/docbook5xml.py
+++ b/tldp/doctypes/docbook5xml.py
@@ -72,14 +72,6 @@ class Docbook5XML(BaseDoctype, SignatureChecker):
         return True
 
     @depends(graph, chdir_output)
-    def validate_source(self):
-        '''consider lxml.etree and other validators'''
-        s = '''"{config.docbook5xml_jing}" \\
-                  "{config.docbook5xml_rngfile}" \\
-                  "{source.filename}"'''
-        return self.shellscript(s)
-
-    @depends(graph, validate_source)
     def make_xincluded_source(self):
         s = '''"{config.docbook5xml_xmllint}" > "{output.validsource}" \\
                   --nonet \\
@@ -88,6 +80,14 @@ class Docbook5XML(BaseDoctype, SignatureChecker):
                   "{source.filename}"'''
         return self.shellscript(s)
 
+    @depends(graph, make_xincluded_source)
+    def validate_source(self):
+        '''consider lxml.etree and other validators'''
+        s = '''"{config.docbook5xml_jing}" \\
+                  "{config.docbook5xml_rngfile}" \\
+                  "{output.validsource}"'''
+        return self.shellscript(s)
+
     @depends(graph, make_xincluded_source)
     def copy_static_resources(self):
         source = list()