[PATCH 2/3] Updated build system to reflect source tree reorganisation

[Guillaume Emont <gemont igalia com>]

---
 configure.ac             |   36 +++++++++++----------
 src/Makefile.am          |   78 ++--------------------------------------------
 src/media/Makefile.am    |   63 +++++++++++++++++++++++++++++++++++++
 src/metadata/Makefile.am |   38 ++++++++++++++++++++++
 4 files changed, 123 insertions(+), 92 deletions(-)
 create mode 100644 src/media/Makefile.am
 create mode 100644 src/metadata/Makefile.am

diff --git a/configure.ac b/configure.ac
index 75ec7cc..bc862c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src])
 
-AM_CONFIG_HEADER(src/config.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -753,22 +753,24 @@ AC_SUBST([builddir])
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
-  src/youtube/Makefile
-  src/fake-metadata/Makefile
-  src/filesystem/Makefile
-  src/jamendo/Makefile
-  src/lastfm-albumart/Makefile
-  src/upnp/Makefile
-  src/flickr/Makefile
-  src/podcasts/Makefile
-  src/bookmarks/Makefile
-  src/shoutcast/Makefile
-  src/apple-trailers/Makefile
-  src/metadata-store/Makefile
-  src/vimeo/Makefile
-  src/gravatar/Makefile
-  src/tracker/Makefile
-  src/local-metadata/Makefile
+  src/media/upnp/Makefile
+  src/media/vimeo/Makefile
+  src/media/bookmarks/Makefile
+  src/media/tracker/Makefile
+  src/media/podcasts/Makefile
+  src/media/jamendo/Makefile
+  src/media/youtube/Makefile
+  src/media/shoutcast/Makefile
+  src/media/flickr/Makefile
+  src/media/filesystem/Makefile
+  src/media/Makefile
+  src/media/apple-trailers/Makefile
+  src/metadata/metadata-store/Makefile
+  src/metadata/gravatar/Makefile
+  src/metadata/lastfm-albumart/Makefile
+  src/metadata/fake-metadata/Makefile
+  src/metadata/Makefile
+  src/metadata/local-metadata/Makefile
   test/Makefile
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a8536b5..21b1df2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,83 +1,11 @@
 #
 # Makefile.am
 #
-# Author: Iago Toral Quiroga <itoral igalia com>
+# Author: Guillaume Emont <gemont igalia com>
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-SUBDIRS =
+SUBDIRS = media metadata
 
-if FAKEMETADATA_PLUGIN
-SUBDIRS += fake-metadata
-endif
+DIST_SUBDIRS = media metadata
 
-if FILESYSTEM_PLUGIN
-SUBDIRS += filesystem
-endif
-
-if JAMENDO_PLUGIN
-SUBDIRS += jamendo
-endif
-
-if LASTFM_ALBUMART_PLUGIN
-SUBDIRS += lastfm-albumart
-endif
-
-if UPNP_PLUGIN
-SUBDIRS += upnp
-endif
-
-if YOUTUBE_PLUGIN
-SUBDIRS += youtube
-endif
-
-if FLICKR_PLUGIN
-SUBDIRS += flickr
-endif
-
-if PODCASTS_PLUGIN
-SUBDIRS += podcasts
-endif
-
-if BOOKMARKS_PLUGIN
-SUBDIRS += bookmarks
-endif
-
-if SHOUTCAST_PLUGIN
-SUBDIRS += shoutcast
-endif
-
-if APPLE_TRAILERS_PLUGIN
-SUBDIRS += apple-trailers
-endif
-
-if METADATA_STORE_PLUGIN
-SUBDIRS += metadata-store
-endif
-
-if VIMEO_PLUGIN
-SUBDIRS += vimeo
-endif
-
-if GRAVATAR_PLUGIN
-SUBDIRS += gravatar
-endif
-
-if TRACKER_PLUGIN
-SUBDIRS += tracker
-endif
-
-if LOCALMETADATA_PLUGIN
-SUBDIRS += local-metadata
-endif
-
-DIST_SUBDIRS =									\
-	youtube fake-metadata filesystem jamendo lastfm-albumart upnp flickr	\
-	podcasts bookmarks shoutcast apple-trailers metadata-store vimeo	\
-	gravatar tracker local-metadata
-
-MAINTAINERCLEANFILES =	\
-        *.in		\
-        *~
-
-DISTCLEANFILES = $(MAINTAINERCLEANFILES)
diff --git a/src/media/Makefile.am b/src/media/Makefile.am
new file mode 100644
index 0000000..df7df83
--- /dev/null
+++ b/src/media/Makefile.am
@@ -0,0 +1,63 @@
+#
+# Makefile.am
+#
+# Authors: Iago Toral Quiroga <itoral igalia com>
+#          Guillaume Emont <gemont igalia com>
+#
+# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
+
+SUBDIRS =
+
+if FILESYSTEM_PLUGIN
+SUBDIRS += filesystem
+endif
+
+if JAMENDO_PLUGIN
+SUBDIRS += jamendo
+endif
+
+if UPNP_PLUGIN
+SUBDIRS += upnp
+endif
+
+if YOUTUBE_PLUGIN
+SUBDIRS += youtube
+endif
+
+if FLICKR_PLUGIN
+SUBDIRS += flickr
+endif
+
+if PODCASTS_PLUGIN
+SUBDIRS += podcasts
+endif
+
+if BOOKMARKS_PLUGIN
+SUBDIRS += bookmarks
+endif
+
+if SHOUTCAST_PLUGIN
+SUBDIRS += shoutcast
+endif
+
+if APPLE_TRAILERS_PLUGIN
+SUBDIRS += apple-trailers
+endif
+
+if VIMEO_PLUGIN
+SUBDIRS += vimeo
+endif
+
+if TRACKER_PLUGIN
+SUBDIRS += tracker
+endif
+
+DIST_SUBDIRS =									\
+	filesystem jamendo upnp youtube flickr podcasts bookmarks shoutcast	\
+	apple-trailers vimeo tracker
+
+MAINTAINERCLEANFILES =	\
+        *.in		\
+        *~
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
diff --git a/src/metadata/Makefile.am b/src/metadata/Makefile.am
new file mode 100644
index 0000000..d58d59e
--- /dev/null
+++ b/src/metadata/Makefile.am
@@ -0,0 +1,38 @@
+#
+# Makefile.am
+#
+# Authors: Iago Toral Quiroga <itoral igalia com>
+#          Guillaume Emont <gemont igalia com>
+#
+# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
+
+SUBDIRS =
+
+if FAKEMETADATA_PLUGIN
+SUBDIRS += fake-metadata
+endif
+
+if LASTFM_ALBUMART_PLUGIN
+SUBDIRS += lastfm-albumart
+endif
+
+if METADATA_STORE_PLUGIN
+SUBDIRS += metadata-store
+endif
+
+if GRAVATAR_PLUGIN
+SUBDIRS += gravatar
+endif
+
+if LOCALMETADATA_PLUGIN
+SUBDIRS += local-metadata
+endif
+
+DIST_SUBDIRS =									\
+	fake-metadata lastfm-albumart metadata-store gravatar local-metadata
+
+MAINTAINERCLEANFILES =	\
+        *.in		\
+        *~
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
-- 
1.7.1