* move mug/ to toys/mug

Makefile.am

@@ -16,13 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-SUBDIRS=man src contrib
+SUBDIRS=man src contrib toys
-
-# build if there is some gtk available
-if HAVE_GTK
-SUBDIRS += mug
-endif
-
 
 # so we can say 'make test'
 check: test cleanupnote

configure.ac

@@ -153,8 +153,9 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/tests/Makefile
-mug/Makefile
+toys/Makefile
-mug/mug.desktop
+toys/mug/Makefile
+toys/mug/mug.desktop
 man/Makefile
 contrib/Makefile
 ])
@@ -165,9 +166,9 @@ echo "mu configuration is complete."
 echo "-----------------------------"
 
 echo
-echo "Note: the Xapian database is no longer stored as <muhome>/xapian-0.6"
+echo "Note: since version 0.7, the Xapian database is no longer stored as "
-echo "but instead simply as <muhome>/xapian. You can remove the older"
+echo "<muhome>/xapian-0.6 but instead simply as <muhome>/xapian. You can "
-echo "<muhome>/xapian-0.6 directory to save some disk space"
+echo "remove the olde <muhome>/xapian-0.6 directory to save some disk space"
 
 echo
 echo "type 'make' to build mu, or 'make check' to run the unit tests."

toys/Makefile.am

@@ -0,0 +1,25 @@
+## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+include $(top_srcdir)/gtest.mk
+
+SUBDIRS=
+
+# build if there is some gtk available
+if HAVE_GTK
+SUBDIRS += mug
+endif
+

toys/mug/Makefile.am

@@ -56,7 +56,7 @@ icondir=				\
 	$(datarootdir)/icons
 
 icon_DATA=				\
-	${top_srcdir}/mug/mug.svg
+	${top_srcdir}/toys/mug/mug.svg
 
 desktopdir=				\
 	$(datarootdir)/applications