11 files changed, 37 insertions, 3 deletions

diff --git a/AUTHORS b/AUTHORS
index b3dd37b13..3fc67833e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Nikos Kouremenos (kourem AT gmail.com)
 Dimitur Kirov (dkirov AT gmail.com)
 Travis Shirk (travis AT pobox.com)
 Jean-Marie Traissard (jim AT lapin.org)
+Stefan Bethge (stefan AT lanpartei.de)
 
 PAST DEVELOPERS:
 
diff --git a/Makefile.am b/Makefile.am
index 9eebf1f33..779b8aa50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,3 +24,20 @@ DISTCLEANFILES = 		\
 	intltool-merge 		\
 	intltool-update		\
 	scripts/gajim
+
+MAINTAINERCLEANFILES = \
+	configure \
+	Makefile.in \
+	intltool-extract.in \
+	intltool-update.in \
+	intltool-merge.in \
+	ltmain.sh \
+	missing \
+	mkinstalldirs \
+	install-sh \
+	compile \
+	depcomp \
+	config.guess \
+	config.sub \
+	aclocal.m4 \
+	libtool
diff --git a/autogen.sh b/autogen.sh
index da4108d45..dee45c0ab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-set -x
   echo "[encoding: UTF-8]" > po/POTFILES.in \
   && ls data/gajim.desktop.in.in data/glade/*.glade \
   src/*py src/common/*py src/common/zeroconf/*.py -1 -U >> \
   po/POTFILES.in || exit 1
+  set -x
   intltoolize --force --automake \
   && aclocal -I ./m4 \
   && libtoolize --copy --force --automake \
diff --git a/configure.ac b/configure.ac
index 3ab972e34..d33490982 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
 		[0.11.0],[http://trac.gajim.org/],[gajim])
+AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADER(config.h)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index d57cd6a13..1e92a0a32 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,3 +22,5 @@ EXTRA_DIST = $(desktop_in_files) \
 DISTCLEANFILES = $(desktop_DATA)
 
 CLEANFILES = gajim.desktop
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/emoticons/Makefile.am b/data/emoticons/Makefile.am
index 463c36e5a..c3feaf585 100644
--- a/data/emoticons/Makefile.am
+++ b/data/emoticons/Makefile.am
@@ -33,4 +33,6 @@ dist-hook:
 			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
 			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
 		fi; \
-	done; 
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index 64e112f7b..a8b810da5 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -4,3 +4,5 @@ glade_DATA = $(srcdir)/*.glade
 EXTRA_DIST = $(glade_DATA)
 
 DISTCLEANFILES = *.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/iconsets/Makefile.am b/data/iconsets/Makefile.am
index 547b110b8..6dbd09b71 100644
--- a/data/iconsets/Makefile.am
+++ b/data/iconsets/Makefile.am
@@ -34,4 +34,6 @@ dist-hook:
 			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
 			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
 		fi; \
-	done; 
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 868898df9..7b06c34ad 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -4,3 +4,5 @@ pixmaps_DATA = $(srcdir)/*.png \
 			   $(srcdir)/events/*.png \
 			   $(srcdir)/agents/*.png
 EXTRA_DIST = $(pixmaps_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 98fd6a15f..3ebe37a2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,10 @@ trayicon_la_LIBADD = $(PYGTK_LIBS)
 trayicon_la_SOURCES = \
 					  eggtrayicon.c \
 					  trayiconmodule.c
+
 nodist_trayicon_la_SOURCES = \
 					trayicon.c
+
 trayicon_la_LDFLAGS = \
 	-module -avoid-version 
 trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
@@ -66,3 +68,4 @@ EXTRA_DIST = $(gajimsrc_DATA) \
 			trayicon.defs \
 			trayicon.override
 
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 2f22417ab..18f4cb796 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -14,3 +14,5 @@ idle_la_LDFLAGS = \
 
 idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES)
 endif
+
+MAINTAINERCLEANFILES = Makefile.in