X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=make-man-rules.py;h=ad601f874f220015b7dad8af72a6df994577cb3c;hp=9f53b55bbd3ff32ceeefe44d9febf3e9360dd279;hb=310b59edcf0a98343425a47ea5835fc670c0cda3;hpb=87cfe600c7a5c0632f8dcc7713b0b1e3825b75cc

diff --git a/make-man-rules.py b/make-man-rules.py
index 9f53b55bb..ad601f874 100644
--- a/make-man-rules.py
+++ b/make-man-rules.py
@@ -18,10 +18,9 @@
 #  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
+from xml_helper import *
 
 SECTION = '''\
 MANPAGES += \\
@@ -46,12 +45,6 @@ HEADER = '''\
 
 '''
 
-CLEANFILES = '''\
-
-CLEANFILES += \\
-	{cleanfiles}
-'''
-
 HTML_ALIAS_RULE = '''\
 {}.html: {}.html
 	$(html-alias)
@@ -61,7 +54,7 @@ def man(page, number):
     return 'man/{}.{}'.format(page, number)
 
 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]
@@ -89,7 +82,7 @@ def create_rules(*xml_files):
 def mjoin(files):
     return ' \\\n\t'.join(sorted(files) or '#')
 
-def make_makefile(rules, cleanfiles):
+def make_makefile(rules):
     return HEADER + '\n'.join(
         (CONDITIONAL if conditional else SECTION).format(
             manpages=mjoin(set(rulegroup.values())),
@@ -101,13 +94,8 @@ def make_makefile(rules, cleanfiles):
                                 for k,v in sorted(rulegroup.items())
                                 if k != v),
             conditional=conditional)
-        for conditional,rulegroup in sorted(rules.items())) + \
-        CLEANFILES.format(cleanfiles=mjoin(cleanfiles))
+        for conditional,rulegroup in sorted(rules.items()))
 
 if __name__ == '__main__':
-    sources = set(sys.argv[1:])
-    basenames = [os.path.basename(source) for source in sources]
-    spares = set([source for source in sources
-                  if os.path.basename(source) + '.in' in basenames])
-    rules = create_rules(*(sources - spares))
-    print(make_makefile(rules, spares), end='')
+    rules = create_rules(*sys.argv[1:])
+    print(make_makefile(rules), end='')