3 files changed, 23 insertions, 96 deletions
diff --git a/modules/pam_radius/Makefile b/modules/pam_radius/Makefile
deleted file mode 100644
index aa149d3e..00000000
--- a/modules/pam_radius/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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!).
-#
-# Created by Cristian Gafton <gafton@redhat.com> 1996/09/10
-#
-# STATIC modules are not supported
-#
-
-include ../../Make.Rules
-
-TITLE=pam_radius
-CONFD=$(CONFIGED)/security
-export CONFD
-CONFILE=$(CONFD)/radius.conf
-export CONFILE
-
-ifeq ($(HAVE_LIBPWDB),yes)
-
-#
-
-LIBSRC = $(TITLE).c
-LIBOBJ = $(TITLE).o
-
-LIBOBJD = $(addprefix dynamic/,$(LIBOBJ))
-#LIBOBJS = $(addprefix static/,$(LIBOBJ))
-
-dynamic/%.o : %.c
-	$(CC) $(CFLAGS) $(DYNAMIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
-
-#static/%.o : %.c
-#	$(CC) $(CFLAGS) $(STATIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
-
-
-ifdef DYNAMIC
-LIBSHARED = $(TITLE).so
-endif
-
-#ifdef STATIC
-#LIBSTATIC = lib$(TITLE).o
-#endif
-
-####################### don't edit below #######################
-
-all: dirs $(LIBSHARED) $(LIBSTATIC) register
-
-dirs:
-ifdef DYNAMIC
-	$(MKDIR) ./dynamic
-endif
-#ifdef STATIC
-#	$(MKDIR) ./static
-#endif
-
-register:
-#ifdef STATIC
-#	( cd .. ; ./register_static $(TITLE) $(TITLE)/$(LIBSTATIC) )
-#endif
-
-ifdef DYNAMIC
-$(LIBOBJD): $(LIBSRC)
-
-$(LIBSHARED):	$(LIBOBJD)
-	$(LD_D) -o $@ $(LIBOBJD) -lpwdb
-endif
-
-#ifdef STATIC
-#$(LIBOBJS): $(LIBSRC)
-#
-#$(LIBSTATIC): $(LIBOBJS)
-#	$(LD) -r -o $@ $(LIBOBJS) -lpwdb
-#endif
-
-install: all
-ifdef DYNAMIC
-	$(INSTALL) -m $(SHLIBMODE) $(LIBSHARED) $(FAKEROOT)$(SECUREDIR)
-endif
-
-remove:
-	rm -f $(FAKEROOT)$(SECUREDIR)/$(TITLE).so
-
-clean:
-	rm -f $(LIBOBJD) $(LIBOBJS) core *~
-	rm -f *.a *.o *.so *.bak dynamic/* static/*
-	rm -rf dynamic static
-
-.c.o:	
-	$(CC) $(CFLAGS) -c $<
-
-else
-
-include ../dont_makefile
-
-endif
diff --git a/modules/pam_radius/Makefile.am b/modules/pam_radius/Makefile.am
new file mode 100644
index 00000000..c5886589
--- /dev/null
+++ b/modules/pam_radius/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+#
+
+CLEANFILES = *~
+
+EXTRA_DIST = README
+
+securelibdir = $(SECUREDIR)
+secureconfdir = $(SCONFIGDIR)
+
+noinst_HEADERS = pam_radius.h
+
+AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+	-I$(top_srcdir)/modules/pammodutil/include/
+AM_LDFLAGS =  -avoid-version -module \
+	-L$(top_builddir)/modules/pammodutil -lpammodutil \
+	-L$(top_builddir)/libpam -lpam
+
+if HAVE_LIBPWDB
+  securelib_LTLIBRARIES = pam_radius.la
+endif
diff --git a/modules/pam_radius/pam_radius.h b/modules/pam_radius/pam_radius.h
index 8cee7ff1..12ee5778 100644
--- a/modules/pam_radius/pam_radius.h
+++ b/modules/pam_radius/pam_radius.h
@@ -5,7 +5,7 @@
 #ifndef PAM_RADIUS_H
 #define PAM_RADIUS_H
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>