summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-31 09:05:56 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-31 09:05:56 +0100
commit051c7d1ed46790eb13e60cfe5b246654171e9d22 (patch)
treedc5fde6cc5dd3ceb92b25738412162cd574a4a9b
parentd4a66a7f9638d4c642356d1fb9e38ac29766a451 (diff)
pam_systemd: restructure Makefile.am and move inside ENABLE_LOGIND
-rw-r--r--Makefile.am56
1 files changed, 28 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index dea9d2b3cf..6f2c87149a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,11 +224,6 @@ noinst_PROGRAMS = \
test-strv \
test-install
-if HAVE_PAM
-pamlib_LTLIBRARIES = \
- pam_systemd.la
-endif
-
dist_pkgsysconf_DATA = \
src/system.conf \
src/user.conf
@@ -1415,6 +1410,34 @@ libsystemd_login_la_LDFLAGS = \
libsystemd_login_la_LIBADD = \
libsystemd-basic.la
+if HAVE_PAM
+pam_systemd_la_SOURCES = \
+ src/pam-module.c \
+ src/dbus-common.c
+
+pam_systemd_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(PAM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -fvisibility=hidden
+
+pam_systemd_la_LDFLAGS = \
+ -module \
+ -export-dynamic \
+ -avoid-version \
+ -shared \
+ -export-symbols-regex '^pam_sm_.*'
+
+pam_systemd_la_LIBADD = \
+ libsystemd-basic.la \
+ libsystemd-daemon.la \
+ $(PAM_LIBS) \
+ $(DBUS_LIBS)
+
+pamlib_LTLIBRARIES = \
+ pam_systemd.la
+endif
+
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-login-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
@@ -1883,29 +1906,6 @@ systemd_tty_ask_password_agent_SOURCES = \
systemd_tty_ask_password_agent_LDADD = \
libsystemd-basic.la
-pam_systemd_la_SOURCES = \
- src/pam-module.c \
- src/dbus-common.c
-
-pam_systemd_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(PAM_CFLAGS) \
- $(DBUS_CFLAGS) \
- -fvisibility=hidden
-
-pam_systemd_la_LDFLAGS = \
- -module \
- -export-dynamic \
- -avoid-version \
- -shared \
- -export-symbols-regex '^pam_sm_.*'
-
-pam_systemd_la_LIBADD = \
- libsystemd-basic.la \
- libsystemd-daemon.la \
- $(PAM_LIBS) \
- $(DBUS_LIBS)
-
libsystemd_daemon_la_SOURCES = \
src/sd-daemon.c