From 45c95b06f330c6f57a0d552671406c384ed7fdb9 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 15 Nov 2010 08:43:00 +0200 Subject: [PATCH] * move mug/ to toys/mug --- Makefile.am | 8 +------- configure.ac | 11 ++++++----- toys/Makefile.am | 25 +++++++++++++++++++++++++ {mug => toys/mug}/Makefile.am | 2 +- {mug => toys/mug}/TODO | 0 {mug => toys/mug}/mug-msg-list-view.c | 0 {mug => toys/mug}/mug-msg-list-view.h | 0 {mug => toys/mug}/mug-msg-view.c | 0 {mug => toys/mug}/mug-msg-view.h | 0 {mug => toys/mug}/mug-query-bar.c | 0 {mug => toys/mug}/mug-query-bar.h | 0 {mug => toys/mug}/mug-shortcuts.c | 0 {mug => toys/mug}/mug-shortcuts.h | 0 {mug => toys/mug}/mug.cc | 0 {mug => toys/mug}/mug.desktop.in | 0 {mug => toys/mug}/mug.svg | 0 16 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 toys/Makefile.am rename {mug => toys/mug}/Makefile.am (98%) rename {mug => toys/mug}/TODO (100%) rename {mug => toys/mug}/mug-msg-list-view.c (100%) rename {mug => toys/mug}/mug-msg-list-view.h (100%) rename {mug => toys/mug}/mug-msg-view.c (100%) rename {mug => toys/mug}/mug-msg-view.h (100%) rename {mug => toys/mug}/mug-query-bar.c (100%) rename {mug => toys/mug}/mug-query-bar.h (100%) rename {mug => toys/mug}/mug-shortcuts.c (100%) rename {mug => toys/mug}/mug-shortcuts.h (100%) rename {mug => toys/mug}/mug.cc (100%) rename {mug => toys/mug}/mug.desktop.in (100%) rename {mug => toys/mug}/mug.svg (100%) diff --git a/Makefile.am b/Makefile.am index 499b99d5..d1ec008f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,13 +16,7 @@ include $(top_srcdir)/gtest.mk -SUBDIRS=man src contrib - -# build if there is some gtk available -if HAVE_GTK -SUBDIRS += mug -endif - +SUBDIRS=man src contrib toys # so we can say 'make test' check: test cleanupnote diff --git a/configure.ac b/configure.ac index c53cdc7d..71099b42 100644 --- a/configure.ac +++ b/configure.ac @@ -153,8 +153,9 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/tests/Makefile -mug/Makefile -mug/mug.desktop +toys/Makefile +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 /xapian-0.6" -echo "but instead simply as /xapian. You can remove the older" -echo "/xapian-0.6 directory to save some disk space" +echo "Note: since version 0.7, the Xapian database is no longer stored as " +echo "/xapian-0.6 but instead simply as /xapian. You can " +echo "remove the olde /xapian-0.6 directory to save some disk space" echo echo "type 'make' to build mu, or 'make check' to run the unit tests." diff --git a/toys/Makefile.am b/toys/Makefile.am new file mode 100644 index 00000000..22f6fc08 --- /dev/null +++ b/toys/Makefile.am @@ -0,0 +1,25 @@ +## Copyright (C) 2008-2010 Dirk-Jan C. Binnema +## +## 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 + diff --git a/mug/Makefile.am b/toys/mug/Makefile.am similarity index 98% rename from mug/Makefile.am rename to toys/mug/Makefile.am index 337c5ab3..a1c73603 100644 --- a/mug/Makefile.am +++ b/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 diff --git a/mug/TODO b/toys/mug/TODO similarity index 100% rename from mug/TODO rename to toys/mug/TODO diff --git a/mug/mug-msg-list-view.c b/toys/mug/mug-msg-list-view.c similarity index 100% rename from mug/mug-msg-list-view.c rename to toys/mug/mug-msg-list-view.c diff --git a/mug/mug-msg-list-view.h b/toys/mug/mug-msg-list-view.h similarity index 100% rename from mug/mug-msg-list-view.h rename to toys/mug/mug-msg-list-view.h diff --git a/mug/mug-msg-view.c b/toys/mug/mug-msg-view.c similarity index 100% rename from mug/mug-msg-view.c rename to toys/mug/mug-msg-view.c diff --git a/mug/mug-msg-view.h b/toys/mug/mug-msg-view.h similarity index 100% rename from mug/mug-msg-view.h rename to toys/mug/mug-msg-view.h diff --git a/mug/mug-query-bar.c b/toys/mug/mug-query-bar.c similarity index 100% rename from mug/mug-query-bar.c rename to toys/mug/mug-query-bar.c diff --git a/mug/mug-query-bar.h b/toys/mug/mug-query-bar.h similarity index 100% rename from mug/mug-query-bar.h rename to toys/mug/mug-query-bar.h diff --git a/mug/mug-shortcuts.c b/toys/mug/mug-shortcuts.c similarity index 100% rename from mug/mug-shortcuts.c rename to toys/mug/mug-shortcuts.c diff --git a/mug/mug-shortcuts.h b/toys/mug/mug-shortcuts.h similarity index 100% rename from mug/mug-shortcuts.h rename to toys/mug/mug-shortcuts.h diff --git a/mug/mug.cc b/toys/mug/mug.cc similarity index 100% rename from mug/mug.cc rename to toys/mug/mug.cc diff --git a/mug/mug.desktop.in b/toys/mug/mug.desktop.in similarity index 100% rename from mug/mug.desktop.in rename to toys/mug/mug.desktop.in diff --git a/mug/mug.svg b/toys/mug/mug.svg similarity index 100% rename from mug/mug.svg rename to toys/mug/mug.svg