From 23624ea6f78ec8acc167a2491c00998907fc76b1 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@thkukuk.de>
Date: Tue, 16 Aug 2005 12:27:38 +0000
Subject: Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------

Big "automake/autoconf/libtool" commit
---
 modules/pam_time/Makefile    | 21 ---------------------
 modules/pam_time/Makefile.am | 20 ++++++++++++++++++++
 modules/pam_time/pam_time.c  |  5 -----
 3 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 modules/pam_time/Makefile
 create mode 100644 modules/pam_time/Makefile.am

(limited to 'modules/pam_time')

diff --git a/modules/pam_time/Makefile b/modules/pam_time/Makefile
deleted file mode 100644
index 9c2d0eb3..00000000
--- a/modules/pam_time/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-#
-# This Makefile controls a build process of $(TITLE) module for
-# Linux-PAM. You should not modify this Makefile (unless you know
-# what you are doing!).
-#
-
-include ../../Make.Rules
-
-TITLE=pam_time
-LOCAL_CONFILE=./time.conf
-INSTALLED_CONFILE=$(SCONFIGD)/time.conf
-
-DEFS=-DDEFAULT_CONF_FILE=\"$(INSTALLED_CONFILE)\"
-CFLAGS += $(DEFS)
-
-MODULE_SIMPLE_INSTALL=bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONFILE)" "$(TITLE)" "$(LOCAL_CONFILE)"
-MODULE_SIMPLE_REMOVE=rm -f $(FAKEROOT)$(INSTALLED_CONFILE)
-MODULE_SIMPLE_CLEAN=rm -f ./.ignore_age
-
-include ../Simple.Rules
diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
new file mode 100644
index 00000000..95245fde
--- /dev/null
+++ b/modules/pam_time/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+#
+
+CLEANFILES = *~
+
+EXTRA_DIST = README time.conf
+
+securelibdir = $(SECUREDIR)
+secureconfdir = $(SCONFIGDIR)
+
+AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+	-I$(top_srcdir)/modules/pammodutil/include/ \
+	-DPAM_TIME_CONF=\"$(SCONFIGDIR)/time.conf\"
+AM_LDFLAGS =  -avoid-version -module \
+	-L$(top_builddir)/modules/pammodutil -lpammodutil \
+	-L$(top_builddir)/libpam -lpam
+
+securelib_LTLIBRARIES = pam_time.la
+secureconf_DATA = time.conf
diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index a7e79364..30432298 100644
--- a/modules/pam_time/pam_time.c
+++ b/modules/pam_time/pam_time.c
@@ -28,11 +28,6 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef DEFAULT_CONF_FILE
-# define PAM_TIME_CONF         DEFAULT_CONF_FILE /* from external define */
-#else
-# define PAM_TIME_CONF         "/etc/security/time.conf"
-#endif
 #define PAM_TIME_BUFLEN        1000
 #define FIELD_SEPARATOR        ';'   /* this is new as of .02 */
 
-- 
cgit v1.2.3