cleanup

diff --git a/.gitignore b/.gitignore
index 6b25797..8324076 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,18 @@
-/aclocal.m4
+aclocal.m4
 autom4te.cache
-/compile
-/config.guess
-/config.log
-/config.status
-/config.sub
-/config.h
-/configure
-/depcomp
+compile
+config.cache
+config.guess
+config.log
+config.status
+config.sub
+config.h
+configure
+depcomp
 
-/libtool
-/ltmain.sh
-/missing
+libtool
+ltmain.sh
+missing
 
 .DS_Store
 
@@ -20,8 +21,11 @@ Makefile
 
 *.la
 *.lo
+*.o
 *~
 
 .deps
 .libs
 *.dSYM
+
+stamp-h1

diff --git a/aclocal.m4 b/aclocal.m4
index b77a55a..2aa0728 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -860,9 +860,6 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([config/kerberos_v4.m4])
-m4_include([config/plain.m4])
-m4_include([config/sasldb.m4])
 m4_include([cmulocal/berkdb.m4])
 m4_include([cmulocal/bsd_sockets.m4])
 m4_include([cmulocal/c-attribute.m4])
@@ -870,11 +867,14 @@ m4_include([cmulocal/common.m4])
 m4_include([cmulocal/cyrus.m4])
 m4_include([cmulocal/init_automake.m4])
 m4_include([cmulocal/ipv6.m4])
-m4_include([cmulocal/libtool.m4])
-m4_include([cmulocal/ltoptions.m4])
-m4_include([cmulocal/ltsugar.m4])
-m4_include([cmulocal/ltversion.m4])
-m4_include([cmulocal/lt~obsolete.m4])
 m4_include([cmulocal/openldap.m4])
 m4_include([cmulocal/openssl.m4])
 m4_include([cmulocal/sasl2.m4])
+m4_include([config/kerberos_v4.m4])
+m4_include([config/libtool.m4])
+m4_include([config/ltoptions.m4])
+m4_include([config/ltsugar.m4])
+m4_include([config/ltversion.m4])
+m4_include([config/lt~obsolete.m4])
+m4_include([config/plain.m4])
+m4_include([config/sasldb.m4])

diff --git a/autogen.sh b/autogen.sh
index 8676972..54c6c74 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,12 +2,12 @@
 touch NEWS
 libtoolize --copy --install
 aclocal -I config -I cmulocal
+automake --add-missing
 autoconf
-automake
 autoheader
 
 cd saslauthd
 aclocal -I ../config -I ../cmulocal
+automake --add-missing
 autoconf
-automake
 autoheader

diff --git a/include/.gitignore b/include/.gitignore
new file mode 100644 (file)
index 0000000..1ffef52
--- /dev/null
+++ b/include/.gitignore
@@ -0,0 +1,2 @@
+makemd5
+md5global.h

diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644 (file)
index 0000000..30bff20
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1 @@
+*_init.c

diff --git a/saslauthd/.gitignore b/saslauthd/.gitignore
new file mode 100644 (file)
index 0000000..5478694
--- /dev/null
+++ b/saslauthd/.gitignore
@@ -0,0 +1,3 @@
+saslauthd
+saslauthd.h
+testsaslauthd

diff --git a/saslauthd/aclocal.m4 b/saslauthd/aclocal.m4
index 385ee31..5a94ebf 100644 (file)
--- a/saslauthd/aclocal.m4
+++ b/saslauthd/aclocal.m4
@@ -860,8 +860,6 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../config/kerberos_v4.m4])
-m4_include([../config/sasldb.m4])
 m4_include([../cmulocal/berkdb.m4])
 m4_include([../cmulocal/bsd_sockets.m4])
 m4_include([../cmulocal/c-attribute.m4])
@@ -871,3 +869,5 @@ m4_include([../cmulocal/init_automake.m4])
 m4_include([../cmulocal/ipv6.m4])
 m4_include([../cmulocal/openssl.m4])
 m4_include([../cmulocal/sasl2.m4])
+m4_include([../config/kerberos_v4.m4])
+m4_include([../config/sasldb.m4])

diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644 (file)
index 0000000..aa3e681
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,4 @@
+dbconverter-2
+pluginviewer
+sasldblistusers2
+saslpasswd2