summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-08 12:40:52 +0200
committerAndy Wingo <wingo@pobox.com>2015-04-08 12:40:52 +0200
commit796f9ac2ba3731fec49fd684b1adc02cfbe6f11b (patch)
tree8cc04b9c4f703acffcc9362fa0fa13087004c06a
parent7b061de2d0601a33f7246c4b909f30ddc44d7ab6 (diff)
pam_elogind compiling
-rw-r--r--Makefile.am22
-rw-r--r--src/login/pam_elogind.c (renamed from src/login/pam_systemd.c)0
-rw-r--r--src/login/pam_elogind.sym (renamed from src/login/pam_systemd.sym)0
3 files changed, 9 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 78e0740d4a..6586937e38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -525,8 +525,6 @@ libsystemd_shared_la_SOURCES = \
src/shared/json.h \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
- src/shared/smack-util.c \
- src/shared/smack-util.h \
src/shared/label.c \
src/shared/label.h \
src/shared/socket-label.c \
@@ -976,8 +974,7 @@ libsystemd_logind_core_la_SOURCES = \
libsystemd_logind_core_la_LIBADD = \
$(UDEV_LIBS) \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-internal.la
if HAVE_ACL
libsystemd_logind_core_la_SOURCES += \
@@ -1059,30 +1056,29 @@ tests += \
test-login-shared
if HAVE_PAM
-pam_systemd_la_SOURCES = \
- src/login/pam_systemd.sym \
- src/login/pam_systemd.c
+pam_elogind_la_SOURCES = \
+ src/login/pam_elogind.sym \
+ src/login/pam_elogind.c
-pam_systemd_la_CFLAGS = \
+pam_elogind_la_CFLAGS = \
$(AM_CFLAGS) \
$(PAM_CFLAGS) \
-fvisibility=hidden
-pam_systemd_la_LDFLAGS = \
+pam_elogind_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
-export-dynamic \
-avoid-version \
-shared \
- -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
+ -Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
-pam_systemd_la_LIBADD = \
+pam_elogind_la_LIBADD = \
libsystemd-internal.la \
- libsystemd-shared.la \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
- pam_systemd.la
+ pam_elogind.la
dist_pamconf_DATA = \
src/login/systemd-user
diff --git a/src/login/pam_systemd.c b/src/login/pam_elogind.c
index d7a708fd0a..d7a708fd0a 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_elogind.c
diff --git a/src/login/pam_systemd.sym b/src/login/pam_elogind.sym
index 23ff75f688..23ff75f688 100644
--- a/src/login/pam_systemd.sym
+++ b/src/login/pam_elogind.sym