4 files changed, 22 insertions, 80 deletions
diff --git a/conf/Makefile b/conf/Makefile
deleted file mode 100644
index d829a38c..00000000
--- a/conf/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-#
-
-dummy:
-	@echo "*** This is not a top level Makefile!"
-
-##########################################################
-
-all:
-	$(MAKE) -C pam_conv1 all
-
-install: $(FAKEROOT)$(CONFIGED)/pam.conf
-	$(MAKE) -C pam_conv1 install
-
-$(FAKEROOT)$(CONFIGED)/pam.conf: ./pam.conf
-	bash -f ./install_conf
-
-remove:
-	rm -f $(FAKEROOT)$(CONFIGED)/pam.conf
-	$(MAKE) -C pam_conv1 remove
-
-check:
-	bash -f ./md5itall
-
-lclean:
-	rm -f core *~ .ignore_age
-
-clean: lclean
-	$(MAKE) -C pam_conv1 clean
-
-extraclean: lclean
-	$(MAKE) -C pam_conv1 extraclean
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 00000000..f8b693bf
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,6 @@
+
+SUBDIRS = pam_conv1
+
+CLEANFILES = *~
+
+EXTRA_DIST = install_conf md5itall pam.conf
diff --git a/conf/pam_conv1/Makefile b/conf/pam_conv1/Makefile
deleted file mode 100644
index 5cd1882c..00000000
--- a/conf/pam_conv1/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-include ../../Make.Rules
-
-#
-ifeq ($(OS),solaris)
-
-clean:
-      @echo not available in Solaris
-
-all:
-      @echo not available in Solaris
-
-install:
-      @echo not available in Solaris
-
-else
-
-all: pam_conv1
-
-pam_conv1: pam_conv.tab.c lex.yy.c
-	$(CC) -o pam_conv1 $(CFLAGS) pam_conv.tab.c $(LINK_LIBLEX)
-
-pam_conv.tab.c: pam_conv.y lex.yy.c
-	bison pam_conv.y
-
-lex.yy.c: pam_conv.lex
-	flex pam_conv.lex
-
-lclean:
-	rm -f core pam_conv1 lex.yy.c pam_conv.tab.c *.o *~
-	rm -rf ./pam.d pam_conv.output
-
-clean: lclean
-
-install: pam_conv1
-	cp -f ./pam_conv1 ../../bin
-
-endif
-
-remove:
-	rm -f ../../bin/pam_conv1
-
-extraclean: remove clean
diff --git a/conf/pam_conv1/Makefile.am b/conf/pam_conv1/Makefile.am
new file mode 100644
index 00000000..0bf5b892
--- /dev/null
+++ b/conf/pam_conv1/Makefile.am
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+#
+
+CLEANFILES = *~
+
+EXTRA_DIST = README lex.yy.c
+
+noinst_PROGRAMS = pam_conv1
+
+pam_conv1_SOURCES = pam_conv.lex pam_conv.y
+
+pam_conv1_LDADD = @LEXLIB@
+
+lex.yy.c: pam_conv.lex
+	$(LEX) pam_conv.lex