diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-25 17:04:41 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-26 11:12:04 +0200 |
| commit | 2b3ab29de466ae6bd7c3243a5a48c7291cc2af0a (patch) | |
| tree | d05ee97a37a87c6ee80ef62b1974f6e2c5724db9 /Makefile.am | |
| parent | bd16acf35e13a19cd2ded0a0c2ef774a98f73808 (diff) | |
Move part of logind.c into a separate file
liblogind-core.la was underlinked, missing a few functions
defined in logind.c. They are moved to a new file, logind-core.c,
and this file is linked into liblogind-core.la.
In addition, logind-acl.c is attached to the liblogind-core.la,
instead of systemd-logind directly.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 0eee1d93f0..92de1630b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3761,15 +3761,8 @@ systemd_logind_LDADD = \ libsystemd-logind-core.la \ $(libsystemd_logind_core_la_LIBADD) -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c - -systemd_logind_LDADD += \ - libsystemd-acl.la -endif - libsystemd_logind_core_la_SOURCES = \ + src/login/logind-core.c \ src/login/logind-dbus.c \ src/login/logind-device.c \ src/login/logind-device.h \ @@ -3807,6 +3800,14 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-id128-internal.la \ libudev.la +if HAVE_ACL +libsystemd_logind_core_la_SOURCES += \ + src/login/logind-acl.c + +libsystemd_logind_core_la_LIBADD += \ + libsystemd-acl.la +endif + noinst_LTLIBRARIES += \ libsystemd-logind-core.la |