chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Prep v220: Apply "Fixes to user and session saving"
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f9d1c1ac53fdcff467ec45a1632954058b372cf5..e104c41d4e8fb1698a03654bc782c9e27ed83439 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=6
+LIBELOGIND_CURRENT=7
 LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=6
+LIBELOGIND_AGE=7
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -54,18 +54,22 @@ bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
 varlogdir=$(localstatedir)/log
 elogindstatedir=$(localstatedir)/lib/elogind
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
+
+udevrulesdir=@udevrulesdir@
+udevbindir=@udevbindir@
+
+PKTTYAGENT=$(bindir)/pkttyagent
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
 pkgincludedir=$(includedir)/elogind
-udevrulesdir=$(rootprefix)/lib/udev/rules.d
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
-
-# And these are the special ones for /
-rootprefix=@rootprefix@
-rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+udevlibexecdir=$(udevbindir)
+udevhomedir=$(udevlibexecdir)
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+factory_etcdir = $(datadir)/factory/etc
+factory_pamdir = $(datadir)/factory/etc/pam.d
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -116,22 +120,24 @@ CLEANFILES = $(BUILT_SOURCES) \
        $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
        $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
 
-# FIXME a different pkttyagent path...
-
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
+       -DSYSTEMD_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/logind-cgroups-agent\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
-       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DHALT=\"$(HALT)\" \
+       -DREBOOT=\"$(REBOOT)\" \
+       -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DKEXEC=\"$(KEXEC)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DROOTLIBDIR=\"$(rootlibdir)\" \
-       -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
        -I $(top_srcdir)/src \
        -I $(top_builddir)/src/shared \
@@ -148,18 +154,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-define move-to-rootlibdir
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-               rm -f $(DESTDIR)$(libdir)/$$libname && \
-               $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-               mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-       fi
-endef
-
-INSTALL_DIRS =
-
 SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
@@ -203,9 +197,6 @@ define add-wants
          for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
 endef
 
-install-directories-hook:
-       $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
-
 install-aliases-hook:
        set -- $(GENERAL_ALIASES) && \
                dir= && $(install-relative-aliases)
@@ -233,7 +224,6 @@ install-touch-usr-hook:
 
 INSTALL_EXEC_HOOKS += \
        install-target-wants-hook \
-       install-directories-hook \
        install-aliases-hook \
        install-touch-usr-hook
 
@@ -264,9 +254,8 @@ AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
 AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
-rootbin_PROGRAMS =
 bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
 dist_bashcompletion_DATA =
 dist_zshcompletion_DATA =
 
@@ -416,6 +405,7 @@ libelogind_shared_la_SOURCES = \
        src/shared/cgroup-util.h \
        src/shared/cgroup-show.c \
        src/shared/cgroup-show.h \
+       src/shared/logs-show.h \
        src/shared/unit-name.c \
        src/shared/unit-name.h \
        src/shared/watchdog.c \
@@ -486,6 +476,12 @@ libelogind_shared_la_SOURCES = \
        src/shared/base-filesystem.h \
        src/shared/memfd-util.c \
        src/shared/memfd-util.h \
+       src/shared/process-util.c \
+       src/shared/process-util.h \
+       src/shared/random-util.c \
+       src/shared/random-util.h \
+       src/shared/terminal-util.c \
+       src/shared/terminal-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
        src/shared/nss-util.h \
@@ -497,7 +493,9 @@ libelogind_shared_la_SOURCES = \
        src/shared/import-util.c \
        src/shared/import-util.h \
        src/shared/sysctl-util.c \
-       src/shared/sysctl-util.h
+       src/shared/sysctl-util.h \
+       src/shared/hostname-util.h \
+       src/shared/hostname-util.c
 
 nodist_libelogind_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -519,6 +517,9 @@ libelogind_shared_la_LIBADD = \
        $(CAP_LIBS) \
        -lm
 
+libelogind_shared_la_LDFLAGS = \
+       $(CAP_LDFLAGS)
+
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -633,6 +634,7 @@ libelogind_internal_la_SOURCES = \
        src/systemd/sd-daemon.h \
        src/systemd/sd-path.h \
        src/systemd/sd-network.h \
+       src/systemd/sd-hwdb.h \
        src/systemd/sd-device.h \
        src/libelogind/sd-bus/sd-bus.c \
        src/libelogind/sd-bus/bus-control.c \
@@ -695,8 +697,13 @@ libelogind_internal_la_SOURCES = \
        src/libelogind/sd-network/sd-network.c \
        src/libelogind/sd-network/network-util.h \
        src/libelogind/sd-network/network-util.c \
+       src/libelogind/sd-hwdb/sd-hwdb.c \
+       src/libelogind/sd-hwdb/hwdb-util.h \
+       src/libelogind/sd-hwdb/hwdb-internal.h \
        src/libelogind/sd-device/device-internal.h \
        src/libelogind/sd-device/device-util.h \
+       src/libelogind/sd-device/device-enumerator.c \
+       src/libelogind/sd-device/device-enumerator-private.h \
        src/libelogind/sd-device/sd-device.c \
        src/libelogind/sd-device/device-private.c \
        src/libelogind/sd-device/device-private.h
@@ -708,32 +715,45 @@ libelogind_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
-BUILT_SOURCES += \
-       src/libelogind/libelogind.sym
-
-
 libelogind_internal_la_LIBADD = \
        libelogind-shared.la
 
 libelogind_internal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \
-       -Wl,--version-script=$(top_builddir)/src/libelogind/libelogind.sym
+       $(AM_LDFLAGS)
+
+lib_LTLIBRARIES += \
+       libelogind.la
+
+libelogind_la_SOURCES =
 
-libelogind-install-hook:
-       libname=libelogind.so && $(move-to-rootlibdir)
+libelogind_la_CFLAGS = \
+       $(AM_CFLAGS)
 
-libelogind-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
+libelogind_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \
+       -Wl,--version-script=src/libelogind/libelogind.sym
 
-INSTALL_EXEC_HOOKS += libelogind-install-hook
-UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
+libelogind_la_LIBADD = \
+       libelogind-internal.la
 
 pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-login.h
+       src/systemd/sd-login.h \
+       src/systemd/sd-messages.h \
+       src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h
+
+EXTRA_DIST += \
+       src/libelogind/libelogind.sym.m4 \
+       src/libelogind/libelogind.pc.in \
+       src/libelogind/sd-bus/DIFFERENCES \
+       src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+
+BUILT_SOURCES += \
+       src/libelogind/libelogind.sym
 
 # ------------------------------------------------------------------------------
 elogind_SOURCES = \
@@ -785,8 +805,7 @@ endif
 noinst_LTLIBRARIES += \
        libelogind-core.la
 
-rootlibexec_PROGRAMS += \
-       elogind
+pkglibexec_PROGRAMS += elogind
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
@@ -798,9 +817,19 @@ loginctl_LDADD = \
        libelogind-internal.la \
        libelogind-shared.la
 
-rootbin_PROGRAMS += \
+bin_PROGRAMS += \
        loginctl
 
+logind_cgroups_agent_SOURCES = \
+       src/cgroups-agent/cgroups-agent.c
+
+logind_cgroups_agent_LDADD = \
+       libelogind-internal.la \
+       libelogind-shared.la
+
+pkglibexec_PROGRAMS += \
+       logind-cgroups-agent
+
 dist_bashcompletion_DATA += \
        shell-completion/bash/loginctl
 
@@ -814,7 +843,7 @@ systemd_inhibit_LDADD = \
        libelogind-internal.la \
        libelogind-shared.la
 
-rootbin_PROGRAMS += \
+bin_PROGRAMS += \
        systemd-inhibit
 
 test_login_SOURCES = \
@@ -839,7 +868,8 @@ test_inhibit_LDADD = \
        libelogind-shared.la
 
 test_login_tables_SOURCES = \
-       src/login/test-login-tables.c
+       src/login/test-login-tables.c \
+       src/shared/test-tables.h
 
 test_login_tables_LDADD = \
        libelogind-core.la
@@ -894,9 +924,6 @@ dist_pkgsysconf_DATA += \
 polkitpolicy_files += \
        src/login/org.freedesktop.login1.policy
 
-INSTALL_DIRS += \
-       $(elogindstatedir)
-
 SYSTEM_UNIT_ALIASES += \
        elogind.service dbus-org.freedesktop.login1.service
 
@@ -920,12 +947,10 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
-       '|rootlibexecdir=$(rootlibexecdir)|' \
-       '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
+       '|udevbindir=$(udevbindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
        '|pkgdatadir=$(pkgdatadir)|' \
-       '|udevrulesdir=$(udevrulesdir)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -936,7 +961,6 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|VARLOGDIR=$(varlogdir)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|'
 
@@ -1085,9 +1109,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-       --with-rootprefix=$$dc_install_base \
-       --disable-split-usr \
-       --enable-kdbus
+       --enable-kdbus \
+       --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
 
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
Unnamed repository; edit this file 'description' to name the repository.