X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=make-man-rules.py;h=0d1ca244c467d0b8bba7fdd85d42bc0f9703eee9;hp=46a586374f6d34dbd1fba2beef5b3bf127d86ff1;hb=d711a957780932a2705d9ae9a1fc1b6fa7200b75;hpb=aa0bb9c2c4500696530957f715e097c00bd9e8c4

diff --git a/make-man-rules.py b/make-man-rules.py
index 46a586374..0d1ca244c 100644
--- a/make-man-rules.py
+++ b/make-man-rules.py
@@ -18,9 +18,10 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import xml.etree.ElementTree as tree
 import collections
 import sys
+import os.path
+from xml_helper import *
 
 SECTION = '''\
 MANPAGES += \\
@@ -50,11 +51,20 @@ HTML_ALIAS_RULE = '''\
 	$(html-alias)
 '''
 
+FOOTER = '''\
+
+EXTRA_DIST += \\
+       {files}
+'''
+
 def man(page, number):
     return 'man/{}.{}'.format(page, number)
 
+def xml(file):
+    return 'man/{}'.format(os.path.basename(file))
+
 def add_rules(rules, name):
-    xml = tree.parse(name)
+    xml = xml_parse(name)
     # print('parsing {}'.format(name), file=sys.stderr)
     conditional = xml.getroot().get('conditional') or ''
     rulegroup = rules[conditional]
@@ -72,7 +82,7 @@ def add_rules(rules, name):
         rulegroup[alias] = target
         # print('{} => {} [{}]'.format(alias, target, conditional), file=sys.stderr)
 
-def create_rules(*xml_files):
+def create_rules(xml_files):
     " {conditional => {alias-name => source-name}} "
     rules = collections.defaultdict(dict)
     for name in xml_files:
@@ -82,7 +92,7 @@ def create_rules(*xml_files):
 def mjoin(files):
     return ' \\\n\t'.join(sorted(files) or '#')
 
-def make_makefile(rules):
+def make_makefile(rules, files):
     return HEADER + '\n'.join(
         (CONDITIONAL if conditional else SECTION).format(
             manpages=mjoin(set(rulegroup.values())),
@@ -94,8 +104,10 @@ def make_makefile(rules):
                                 for k,v in sorted(rulegroup.items())
                                 if k != v),
             conditional=conditional)
-        for conditional,rulegroup in sorted(rules.items()))
+        for conditional,rulegroup in sorted(rules.items())
+        ) + FOOTER.format(files=mjoin(sorted(files)))
 
 if __name__ == '__main__':
-    rules = create_rules(*sys.argv[1:])
-    print(make_makefile(rules), end='')
+    rules = create_rules(sys.argv[1:])
+    files = (xml(file) for file in sys.argv[1:])
+    print(make_makefile(rules, files), end='')