From 1cfc78c91965df340cdde100ad6cb3ed50b28927 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 16 Dec 2016 12:09:41 +0100 Subject: Prep v221: Update and clean up build system to sync with upstream This commit replays the moving around of source files that have been done between systemd-219 and systemd-221. Further the Makefile.am is synchronized with the upstream version and then "re-cleaned". A lot of functions, that are not used anywhere in elogind have been coated into #if 0/#endif directives to further shorten the list of dependencies. All unneeded files have been removed. --- Makefile-man.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Makefile-man.am') diff --git a/Makefile-man.am b/Makefile-man.am index f931ac436..65a6a894e 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1,11 +1,10 @@ MANPAGES += \ man/loginctl.1 \ - man/logind.conf.5 \ - man/logind.8 + man/elogind.conf.5 MANPAGES_ALIAS += \ - man/logind.conf.d.5 -man/logind.conf.d.5: man/logind.conf.5 -man/logind.conf.d.html: man/logind.conf.html + man/elogind.conf.d.5 +man/elogind.conf.d.5: man/elogind.conf.5 +man/elogind.conf.d.html: man/elogind.conf.html $(html-alias) if HAVE_PAM @@ -228,8 +227,7 @@ endif EXTRA_DIST += \ man/loginctl.xml \ - man/logind.xml \ - man/logind.conf.xml \ + man/elogind.conf.xml \ man/pam_elogind.xml \ man/sd_get_seats.xml \ man/sd_login_monitor_new.xml \ -- cgit v1.2.3