X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d2bd3404ce4c29f7e448264674945f3ac90e7bf1;hp=6e9259be9bcfa1872d7dffd7b2b2ddb4af9dbcf4;hb=34a35eced40860181757abe5ec00ac0e5d8d0225;hpb=0de4f055841fe202a85258a56c67751ccb0f8ee2

diff --git a/Makefile.am b/Makefile.am
index 6e9259be9..d2bd3404c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=1
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=1
@@ -468,7 +468,8 @@ libsystemd_basic_la_SOURCES = \
 	src/socket-util.c \
 	src/log.c \
 	src/ratelimit.c \
-	src/exit-status.c
+	src/exit-status.c \
+        src/utf8.c
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -649,9 +650,9 @@ EXTRA_DIST += \
 	src/dbus-loop.h \
 	src/spawn-agent.h \
 	src/acl-util.h \
-	src/logs-show.h
+	src/logs-show.h \
+        src/utf8.h
 
-if ENABLE_MANPAGES
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
@@ -673,6 +674,7 @@ MANPAGES = \
 	man/systemd.device.5 \
 	man/systemd.snapshot.5 \
 	man/systemd.exec.5 \
+	man/systemd.special.7 \
 	man/daemon.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
@@ -700,31 +702,19 @@ man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 
+if ENABLE_MANPAGES
 dist_man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
 
-nodist_man_MANS = \
-	man/systemd.special.7
-
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 
-XML_IN_FILES = \
-	${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
-
 dist_noinst_DATA = \
 	${XML_FILES:.xml=.html}
 
-nodist_noinst_DATA = \
-	${XML_IN_FILES:.xml.in=.html}
-
 EXTRA_DIST += \
-	$(XML_FILES) \
-	$(XML_IN_FILES) \
-	${nodist_man_MANS:=.in} \
-	${XML_IN_FILES:.xml.in=.html.in}
-
+	$(XML_FILES)
 endif
 
 systemd_SOURCES = \
@@ -1135,7 +1125,6 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon.pc
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd-daemon.7 \
 	man/sd_notify.3 \
@@ -1155,7 +1144,6 @@ man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
-endif
 
 EXTRA_DIST += \
 	src/libsystemd-daemon.pc.in \
@@ -1471,10 +1459,8 @@ binfmt-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	binfmt-install-data-hook
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/binfmt.d.5
-endif
 
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
@@ -1504,10 +1490,8 @@ vconsole-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	vconsole-install-data-hook
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/vconsole.conf.5
-endif
 
 EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
@@ -1560,12 +1544,10 @@ EXTRA_DIST += \
 	units/systemd-readahead-replay.service.in \
 	units/systemd-readahead-done.service.in
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd_readahead.3 \
 	man/sd-readahead.7
 endif
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
@@ -2056,7 +2038,6 @@ dist_udevrules_DATA += \
 nodist_udevrules_DATA += \
 	src/login/73-seat-late.rules
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/systemd-logind.conf.5 \
 	man/sd-login.7 \
@@ -2074,6 +2055,10 @@ MANPAGES_ALIAS += \
 	man/sd_login_monitor_get_fd.3 \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
+	man/sd_session_get_service.3 \
+	man/sd_session_get_type.3 \
+	man/sd_session_get_class.3 \
+	man/sd_session_get_display.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
@@ -2089,6 +2074,10 @@ man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
+man/sd_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_type.3: man/sd_session_is_active.3
+man/sd_session_get_class.3: man/sd_session_is_active.3
+man/sd_session_get_display.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
@@ -2098,7 +2087,6 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
-endif
 
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
@@ -2189,7 +2177,6 @@ CLEANFILES += \
 	$(nodist_systemunit_DATA) \
 	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
-	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA) \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA) \
@@ -2212,61 +2199,31 @@ XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_PROCESS_MAN_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
-	mv ${@:.in=} $@
-
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
-XSLTPROC_PROCESS_HTML_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
-	mv ${@:.in=} $@
-
 man/%.1: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.1.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.3: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.3.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.5: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.5.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.7: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.7.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.8: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.8.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.html: man/%.xml
 	$(XSLTPROC_PROCESS_HTML)
 
-man/%.html.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_HTML_IN)
-
 CLEANFILES += \
 	$(dist_man_MANS) \
-	${nodist_man_MANS:=.in} \
-	${XML_FILES:.xml=.html} \
-	${XML_IN_FILES:.xml.in=.html.in}
+	${XML_FILES:.xml=.html}
 endif
 
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h