diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-29 13:09:52 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-29 20:30:21 -0400 |
commit | aa0bb9c2c4500696530957f715e097c00bd9e8c4 (patch) | |
tree | d563d3977ae3af8df94fb0c0dfa98426ef2c41e2 /make-man-rules.py | |
parent | a696dbef3474f3586b0f189245804b355a700795 (diff) | |
download | systemd-aa0bb9c2c4500696530957f715e097c00bd9e8c4.tar.gz systemd-aa0bb9c2c4500696530957f715e097c00bd9e8c4.tar.bz2 systemd-aa0bb9c2c4500696530957f715e097c00bd9e8c4.zip |
Revert "build-sys: substitute strings in systemd.unit(5)"
This reverts commits c78ab91132aab9193f3c17a9a206f8825ff4be84
and 185c3be03cec26023acc11b49553753aa7330a1d.
It is simpler to just use includes...
Diffstat (limited to 'make-man-rules.py')
-rw-r--r-- | make-man-rules.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/make-man-rules.py b/make-man-rules.py index 9f53b55bbd..46a586374f 100644 --- a/make-man-rules.py +++ b/make-man-rules.py @@ -21,7 +21,6 @@ from __future__ import print_function import xml.etree.ElementTree as tree import collections import sys -import os SECTION = '''\ MANPAGES += \\ @@ -46,12 +45,6 @@ HEADER = '''\ ''' -CLEANFILES = '''\ - -CLEANFILES += \\ - {cleanfiles} -''' - HTML_ALIAS_RULE = '''\ {}.html: {}.html $(html-alias) @@ -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='') |