Commit patch queue (exported by git-debrebase)

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 029c5ff960bddd1d1e64ad11462a9f9c086549fc..8cd0b6c7243fa34c9e4645fb50c46af9eb7e4679 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=19
-LIBELOGIND_REVISION=0
+LIBELOGIND_REVISION=4
 LIBELOGIND_AGE=19
 
 # Dirs of external packages
@@ -65,14 +65,16 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
+
 rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+rootlibdir=@rootlibdir@
+rootlibexecdir=@rootlibexecdir@
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -204,11 +206,7 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
-rootlibexec_PROGRAMS = \
-       elogind \
-       elogind-cgroups-agent
-
-pkglibexec_PROGRAMS =
+rootlibexec_PROGRAMS =
 
 dist_doc_DATA = \
        README \
@@ -906,7 +904,7 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
@@ -993,10 +991,15 @@ pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-login.h \
-       src/systemd/sd-messages.h \
-       src/systemd/sd-id128.h \
-       src/systemd/_sd-common.h
+       src/systemd/sd-bus.h          \
+       src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-bus-vtable.h   \
+       src/systemd/_sd-common.h      \
+       src/systemd/sd-daemon.h       \
+       src/systemd/sd-event.h        \
+       src/systemd/sd-id128.h        \
+       src/systemd/sd-login.h        \
+       src/systemd/sd-messages.h
 
 header-install-hook:
        $(MKDIR_P) $(DESTDIR)/$(pkgincludedir)
@@ -1150,7 +1153,7 @@ endif
 noinst_LTLIBRARIES += \
        libelogind-core.la
 
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind
 
 loginctl_SOURCES = \
@@ -1276,7 +1279,8 @@ gperf_gperf_sources = \
 EXTRA_DIST += \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
-       src/login/logind.conf.in
+       src/login/logind.conf.in \
+       src/login/org.freedesktop.login1.service.in
 
 # ------------------------------------------------------------------------------
 substitutions = \
@@ -1326,6 +1330,9 @@ shell-completion/%: shell-completion/%.in
 %.conf: %.conf.in
        $(SED_PROCESS)
 
+%.login1.service: %.login1.service.in
+       $(SED_PROCESS)
+
 %.sh: %.sh.in
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@