4 files changed, 23 insertions, 60 deletions
diff --git a/modules/pammodutil/Makefile b/modules/pammodutil/Makefile
deleted file mode 100644
index c9cd0062..00000000
--- a/modules/pammodutil/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# $Id$
-#
-#
-
-include ../../Make.Rules
-
-LIBNAME=libpammodutil
-
-# ---------------------------------------------
-
-dummy: all
-
-# ---------------------------------------------
-
-CFLAGS += $(PIC) $(STATIC) $(MOREFLAGS) \
-  -DLIBPAM_VERSION_MAJOR=$(MAJOR_REL) \
-  -DLIBPAM_VERSION_MINOR=$(MINOR_REL)
-
-# all the object files we care about
-LIBOBJECTS = modutil_cleanup.o modutil_getpwnam.o modutil_getpwuid.o \
-	modutil_getspnam.o modutil_getgrnam.o modutil_getgrgid.o \
-	modutil_ingroup.o modutil_getlogin.o modutil_ioloop.o
-
-# static library name
-LIBSTATIC = $(LIBNAME).a
-
-SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS) $(STATICOBJ))
-
-# ---------------------------------------------
-## rules
-
-all: dirs $(LIBSTATIC) ../../Make.Rules
-
-dirs:
-	$(MKDIR) static
-
-static/%.o : %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
-
-$(LIBSTATIC): $(SLIBOBJECTS)
-	ar cr $@ $(SLIBOBJECTS)
-	$(RANLIB) $@
-
-install:
-	@echo "at this time, we're not installing $(LIBSTATIC)"
-
-remove:
-	@echo "at this time, there is nothing to remove"
-
-clean:
-	rm -f a.out core *~ static/*.o
-	rm -f *.a *.o
-	if [ -d dynamic ]; then rmdir dynamic ; fi
-	if [ -d static ]; then rmdir static ; fi
diff --git a/modules/pammodutil/Makefile.am b/modules/pammodutil/Makefile.am
new file mode 100644
index 00000000..d685f350
--- /dev/null
+++ b/modules/pammodutil/Makefile.am
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+#
+
+CLEANFILES = *~
+
+AM_CFLAGS = -I$(srcdir)/include -I$(top_srcdir)/libpam/include
+
+noinst_HEADERS = pammodutil.h include/security/_pam_modutil.h
+
+noinst_LIBRARIES = libpammodutil.a
+
+libpammodutil_a_SOURCES = modutil_cleanup.c modutil_getgrgid.c \
+	modutil_getgrnam.c modutil_getlogin.c modutil_getpwnam.c \
+	modutil_getpwuid.c modutil_getspnam.c modutil_ingroup.c \
+	modutil_ioloop.c
diff --git a/modules/pammodutil/modutil_cleanup.c b/modules/pammodutil/modutil_cleanup.c
index e95d6100..7460da14 100644
--- a/modules/pammodutil/modutil_cleanup.c
+++ b/modules/pammodutil/modutil_cleanup.c
@@ -6,11 +6,12 @@
 
 #include "pammodutil.h"
 
-void _pammodutil_cleanup(pam_handle_t *pamh, void *data, int error_status)
+void
+_pammodutil_cleanup (pam_handle_t *pamh UNUSED, void *data,
+		     int error_status UNUSED)
 {
     if (data) {
 	/* junk it */
 	(void) free(data);
     }
 }
-
diff --git a/modules/pammodutil/modutil_ingroup.c b/modules/pammodutil/modutil_ingroup.c
index 5a3b5d8d..cb04d866 100644
--- a/modules/pammodutil/modutil_ingroup.c
+++ b/modules/pammodutil/modutil_ingroup.c
@@ -40,9 +40,10 @@ static int checkgrouplist(const char *user, gid_t primary, gid_t target)
 }
 #endif
 
-static int _pammodutil_user_in_group_common(pam_handle_t *pamh,
-				            struct passwd *pwd,
-					    struct group *grp)
+static int
+_pammodutil_user_in_group_common(pam_handle_t *pamh UNUSED,
+				 struct passwd *pwd,
+				 struct group *grp)
 {
 	int i;