[gnome-music/wip/merge: 64/343] use AC_CONFIG_FILES to update gnome-config.in

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 3939653386706e362d0177dfb7b168785be63edb
Author: Guillaume Quintard <guillaume quintard gmail com>
Date:   Sun Jul 14 14:15:55 2013 +0200

    use AC_CONFIG_FILES to update gnome-config.in
    
    and rename gnome-music to gnomemusic

 Makefile.am                                  |    2 +-
 configure.ac                                 |    3 +-
 gnome-music/Makefile.am                      |   21 -
 gnome-music/widgets.py                       |  531 --------------------------
 gnomemusic/Makefile.am                       |   13 +
 {gnome-music => gnomemusic}/__init__.py      |    0
 {gnome-music => gnomemusic}/albumArtCache.py |    0
 {gnome-music => gnomemusic}/application.py   |    0
 {gnome-music => gnomemusic}/gnome-music.in   |    0
 {gnome-music => gnomemusic}/grilo.py         |    0
 {gnome-music => gnomemusic}/player.py        |    0
 {gnome-music => gnomemusic}/query.py         |    0
 {gnome-music => gnomemusic}/toolbar.py       |    0
 {gnome-music => gnomemusic}/view.py          |    0
 {gnome-music => gnomemusic}/window.py        |    0
 po/POTFILES.in                               |   20 +-
 16 files changed, 26 insertions(+), 564 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b3fc8a1..eb0fc3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 -I libgd
 NULL =
 
-SUBDIRS = libgd gnome-music data po
+SUBDIRS = libgd gnomemusic data po
 
 EXTRA_DIST = \
        AUTHORS.in \
diff --git a/configure.ac b/configure.ac
index 1a6f52b..8143286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,8 @@ PKG_CHECK_MODULES(GRL, grilo-0.2 >= $GRL_MIN_VERSION)
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
-  gnome-music/Makefile
+  gnomemusic/Makefile
+  gnomemusic/gnome-music
   po/Makefile.in
   libgd/Makefile
 ])
diff --git a/gnomemusic/Makefile.am b/gnomemusic/Makefile.am
new file mode 100644
index 0000000..60de614
--- /dev/null
+++ b/gnomemusic/Makefile.am
@@ -0,0 +1,13 @@
+appdir = $(pythondir)/gnomemusic/
+
+app_PYTHON = \
+       application.py \
+       __init__.py \
+       player.py \
+       toolbar.py \
+       view.py \
+       window.py
+
+bin_SCRIPTS = gnome-music
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = gnome-music.in
diff --git a/gnome-music/__init__.py b/gnomemusic/__init__.py
similarity index 100%
rename from gnome-music/__init__.py
rename to gnomemusic/__init__.py
diff --git a/gnome-music/albumArtCache.py b/gnomemusic/albumArtCache.py
similarity index 100%
rename from gnome-music/albumArtCache.py
rename to gnomemusic/albumArtCache.py
diff --git a/gnome-music/application.py b/gnomemusic/application.py
similarity index 100%
rename from gnome-music/application.py
rename to gnomemusic/application.py
diff --git a/gnome-music/gnome-music.in b/gnomemusic/gnome-music.in
similarity index 100%
rename from gnome-music/gnome-music.in
rename to gnomemusic/gnome-music.in
diff --git a/gnome-music/grilo.py b/gnomemusic/grilo.py
similarity index 100%
rename from gnome-music/grilo.py
rename to gnomemusic/grilo.py
diff --git a/gnome-music/player.py b/gnomemusic/player.py
similarity index 100%
rename from gnome-music/player.py
rename to gnomemusic/player.py
diff --git a/gnome-music/query.py b/gnomemusic/query.py
similarity index 100%
rename from gnome-music/query.py
rename to gnomemusic/query.py
diff --git a/gnome-music/toolbar.py b/gnomemusic/toolbar.py
similarity index 100%
rename from gnome-music/toolbar.py
rename to gnomemusic/toolbar.py
diff --git a/gnome-music/view.py b/gnomemusic/view.py
similarity index 100%
rename from gnome-music/view.py
rename to gnomemusic/view.py
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
new file mode 100644
index 0000000..e69de29
diff --git a/gnome-music/window.py b/gnomemusic/window.py
similarity index 100%
rename from gnome-music/window.py
rename to gnomemusic/window.py
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7042511..5b51b2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,16 +4,16 @@
 # List of source files which contain translatable strings.
 data/org.gnome.Music.gschema.xml
 data/gnome-music.desktop.in
-gnome-music/__init__.py
-gnome-music/albumArtCache.py
-gnome-music/application.py
-gnome-music/grilo.py
-gnome-music/player.py
-gnome-music/query.py
-gnome-music/toolbar.py
-gnome-music/view.py
-gnome-music/widgets.py
-gnome-music/window.py
+gnomemusic/__init__.py
+gnomemusic/albumArtCache.py
+gnomemusic/application.py
+gnomemusic/grilo.py
+gnomemusic/player.py
+gnomemusic/query.py
+gnomemusic/toolbar.py
+gnomemusic/view.py
+gnomemusic/widgets.py
+gnomemusic/window.py
 [type: gettext/glade]data/AlbumWidget.ui
 [type: gettext/glade]data/app-menu.ui
 [type: gettext/glade]data/ArtistAlbumsWidget.ui