chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mount: properly check return for mount_add_*
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index fbf23587bc791820664ab41885d368afb3c34c76..fc8b20c2b46b9f913ff076282d6873f67505c0c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,20 +20,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=1
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=1
+LIBSYSTEMD_ID128_REVISION=2
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -86,7 +86,7 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
@@ -546,7 +546,8 @@ libsystemd_core_la_CFLAGS = \
        $(UDEV_CFLAGS) \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS)
+       $(AUDIT_CFLAGS) \
+       $(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -555,7 +556,8 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
-       $(CAP_LIBS)
+       $(CAP_LIBS) \
+       $(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs. We therefore can't
@@ -670,6 +672,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 \
@@ -697,30 +700,20 @@ 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 = \
        src/main.c
@@ -728,12 +721,10 @@ systemd_SOURCES = \
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(UDEV_CFLAGS)
 
 systemd_LDADD = \
-       libsystemd-core.la \
-       $(KMOD_LIBS)
+       libsystemd-core.la
 
 test_engine_SOURCES = \
        src/test-engine.c
@@ -2062,6 +2053,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 \
@@ -2077,6 +2072,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
@@ -2176,7 +2175,6 @@ CLEANFILES += \
        $(nodist_systemunit_DATA) \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
-       ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
@@ -2199,61 +2197,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
@@ -2515,11 +2483,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootprefix=$$dc_install_base/$(rootprefix)
+       --with-rootprefix=$$dc_install_base/$(prefix)
+
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
        scp man/*.html tango:public/systemd-man/
 
 git-tag:
Unnamed repository; edit this file 'description' to name the repository.