diff options
Diffstat (limited to 'src/grp-login')
-rw-r--r-- | src/grp-login/loginctl/Makefile | 1 | ||||
-rw-r--r-- | src/grp-login/pam_systemd/Makefile | 1 | ||||
-rw-r--r-- | src/grp-login/systemd-inhibit/Makefile | 1 | ||||
-rw-r--r-- | src/grp-login/systemd-logind/Makefile | 18 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile index f1a474e1cc..12987f92bc 100644 --- a/src/grp-login/loginctl/Makefile +++ b/src/grp-login/loginctl/Makefile @@ -29,6 +29,7 @@ loginctl_SOURCES = \ src/login/sysfs-show.c loginctl_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \ diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile index 2f1dfd9db1..2243572b11 100644 --- a/src/grp-login/pam_systemd/Makefile +++ b/src/grp-login/pam_systemd/Makefile @@ -39,6 +39,7 @@ pam_systemd_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/pam_systemd.sym pam_systemd_la_LIBADD = \ + libsystemd-internal.la \ libsystemd-shared.la \ $(PAM_LIBS) diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile index 8b3b7995d9..41775189d4 100644 --- a/src/grp-login/systemd-inhibit/Makefile +++ b/src/grp-login/systemd-inhibit/Makefile @@ -29,6 +29,7 @@ systemd_inhibit_SOURCES = \ src/login/inhibit.c systemd_inhibit_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \ diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile index 24de945818..0dbbc9733b 100644 --- a/src/grp-login/systemd-logind/Makefile +++ b/src/grp-login/systemd-logind/Makefile @@ -23,9 +23,8 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(ENABLE_LOGIND),) - systemd_logind_SOURCES = \ + $(_liblogind_core_la_SOURCES) \ src/login/logind.c \ src/login/logind.h @@ -33,9 +32,10 @@ nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c systemd_logind_LDADD = \ - liblogind-core.la + libsystemd-internal.la \ + libsystemd-shared.la -liblogind_core_la_SOURCES = \ +_liblogind_core_la_SOURCES = \ src/login/logind-core.c \ src/login/logind-device.c \ src/login/logind-device.h \ @@ -64,13 +64,10 @@ liblogind_core_la_LIBADD = \ libsystemd-shared.la ifneq ($(HAVE_ACL),) -liblogind_core_la_SOURCES += \ +_liblogind_core_la_SOURCES += \ src/login/logind-acl.c endif # HAVE_ACL -noinst_LTLIBRARIES += \ - liblogind-core.la - rootlibexec_PROGRAMS += \ systemd-logind @@ -115,8 +112,6 @@ nodist_udevrules_DATA += \ src/login/71-seat.rules \ src/login/73-seat-late.rules -endif # ENABLE_LOGIND - polkitpolicy_in_files += \ src/login/org.freedesktop.login1.policy.in @@ -129,4 +124,7 @@ EXTRA_DIST += \ units/systemd-logind.service.in \ src/login/logind.conf.in +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk |