[gdm] simple-greeter: move gdm-password pam file to data
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] simple-greeter: move gdm-password pam file to data
- Date: Fri, 6 Jul 2012 19:46:23 +0000 (UTC)
commit 675d9870a2b1e25190cae29c03bed1e3956f3084
Author: Ray Strode <rstrode redhat com>
Date: Fri Jul 6 15:43:54 2012 -0400
simple-greeter: move gdm-password pam file to data
That's where the other two are after all.
data/Makefile.am | 8 +++++++-
.../extensions/password => data}/gdm-password.pam | 0
gui/simple-greeter/extensions/password/Makefile.am | 7 +------
.../extensions/password/gdm-password | 19 -------------------
4 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index f0d00bf..536d1a1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -88,6 +88,9 @@ localealias_DATA = locale.alias
sessiondir = $(datadir)/gnome-session/sessions
session_DATA = gdm-fallback.session gdm-shell.session
+gdm-password: gdm-password.pam
+ cp $(srcdir)/gdm-password.pam $(builddir)/gdm-password
+
gdm-fingerprint: gdm-fingerprint.pam
cp $(srcdir)/gdm-fingerprint.pam $(builddir)/gdm-fingerprint
@@ -95,7 +98,7 @@ gdm-smartcard: gdm-smartcard.pam
cp $(srcdir)/gdm-smartcard.pam $(builddir)/gdm-smartcard
pamdir = $(PAM_PREFIX)/pam.d
-pam_DATA = gdm-fingerprint gdm-smartcard
+pam_DATA = gdm-fingerprint gdm-smartcard gdm-password
EXTRA_DIST = \
$(schemas_in_files) \
@@ -108,6 +111,7 @@ EXTRA_DIST = \
gdm \
gdm-autologin \
gdm-welcome \
+ gdm-password.pam \
gdm-fingerprint.pam \
gdm-smartcard.pam \
gdm-fallback.session \
@@ -129,6 +133,7 @@ CLEANFILES = \
PreSession \
PostSession \
$(gsettings_SCHEMAS) \
+ gdm-password \
gdm-fingerprint \
gdm-smartcard \
$(NULL)
@@ -141,6 +146,7 @@ DISTCLEANFILES = \
MAINTAINERCLEANFILES = \
*~ \
+ gdm-password \
gdm-fingerprint \
gdm-smartcard \
Makefile.in
diff --git a/gui/simple-greeter/extensions/password/gdm-password.pam b/data/gdm-password.pam
similarity index 100%
rename from gui/simple-greeter/extensions/password/gdm-password.pam
rename to data/gdm-password.pam
diff --git a/gui/simple-greeter/extensions/password/Makefile.am b/gui/simple-greeter/extensions/password/Makefile.am
index e15fc82..443170c 100644
--- a/gui/simple-greeter/extensions/password/Makefile.am
+++ b/gui/simple-greeter/extensions/password/Makefile.am
@@ -36,16 +36,11 @@ libpassword_la_SOURCES = \
gdm-password-extension.h \
gdm-password-extension.c
-$(PAM_SERVICE_NAME): $(PAM_SERVICE_NAME).pam
- cp $(srcdir)/$(PAM_SERVICE_NAME).pam $(builddir)/$(PAM_SERVICE_NAME)
-
pamdir = $(PAM_PREFIX)/pam.d
pam_DATA = $(PAM_SERVICE_NAME)
-EXTRA_DIST = $(extension_DATA) $(PAM_SERVICE_NAME).pam
-CLEANFILES = $(PAM_SERVICE_NAME)
+EXTRA_DIST = $(extension_DATA)
MAINTAINERCLEANFILES = \
*~ \
- $(PAM_SERVICE_NAME) \
Makefile.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]