GNOME.org
 

[PATCH 2/2] all: install plugins XML file in the same place as the plugin itself

From: "Juan A. Suarez Romero" <jasuarez igalia com>

Sticking together both library and xml file makes things easier to handle,
specially when loading plugins from a different place than standard.

So far, user and/or developer can load plugins from a different place. But this
only was affecting the library files: the xml information files were still
getting from the standard place. Adding new functions and variables to specify
where to look for the xml files adds a unneeded level of complexity.

So the simple approach is to put both files together, so the xml files can be
obtained from the same place where the library resides.

Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>
---
 configure.ac                             |    5 -----
 src/media/apple-trailers/Makefile.am     |    4 ++--
 src/media/bookmarks/Makefile.am          |    4 ++--
 src/media/filesystem/Makefile.am         |    4 ++--
 src/media/flickr/Makefile.am             |    4 ++--
 src/media/jamendo/Makefile.am            |    4 ++--
 src/media/podcasts/Makefile.am           |    4 ++--
 src/media/shoutcast/Makefile.am          |    5 ++---
 src/media/tracker/Makefile.am            |    7 ++-----
 src/media/upnp/Makefile.am               |    4 ++--
 src/media/vimeo/Makefile.am              |    4 ++--
 src/media/youtube/Makefile.am            |    4 ++--
 src/metadata/fake-metadata/Makefile.am   |    4 ++--
 src/metadata/gravatar/Makefile.am        |    4 ++--
 src/metadata/lastfm-albumart/Makefile.am |    4 ++--
 src/metadata/local-metadata/Makefile.am  |    4 ++--
 src/metadata/metadata-store/Makefile.am  |    4 ++--
 17 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/configure.ac b/configure.ac
index bc2612a..e100977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,11 +95,6 @@ GRL_PLUGINS_DIR=`${PKG_CONFIG} --variable=plugindir ${GRL_NAME}`
 AC_SUBST(GRL_PLUGINS_DIR)
 AC_DEFINE_UNQUOTED(GRL_PLUGINS_DIR, "$GRL_PLUGINS_DIR", [Plugins directory])
 
-# Plugins configuration directory
-
-GRL_PLUGINS_CONF_DIR="${datadir}/${GRL_NAME}/plugins"
-AC_SUBST(GRL_PLUGINS_CONF_DIR)
-
 # ----------------------------------------------------------
 # EXTERNAL/OPTIONAL DEPENDENCIES
 # ----------------------------------------------------------
diff --git a/src/media/apple-trailers/Makefile.am b/src/media/apple-trailers/Makefile.am
index 0195de5..90cc3d9 100644
--- a/src/media/apple-trailers/Makefile.am
+++ b/src/media/apple-trailers/Makefile.am
@@ -25,8 +25,8 @@ libgrlappletrailers_la_SOURCES =	\
 	grl-apple-trailers.c		\
 	grl-apple-trailers.h
 
-libdir = $(GRL_PLUGINS_DIR)
-appletrailersxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir						= $(GRL_PLUGINS_DIR)
+appletrailersxmldir		= $(GRL_PLUGINS_DIR)
 appletrailersxml_DATA	= $(APPLE_TRAILERS_PLUGIN_ID).xml
 
 EXTRA_DIST = $(appletrailersxml_DATA)
diff --git a/src/media/bookmarks/Makefile.am b/src/media/bookmarks/Makefile.am
index 0a031f5..ce76650 100644
--- a/src/media/bookmarks/Makefile.am
+++ b/src/media/bookmarks/Makefile.am
@@ -21,8 +21,8 @@ libgrlbookmarks_la_LDFLAGS = \
 
 libgrlbookmarks_la_SOURCES = grl-bookmarks.c grl-bookmarks.h
 
-libdir=$(GRL_PLUGINS_DIR)
-bookmarksxmldir		= $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+bookmarksxmldir	= $(GRL_PLUGINS_DIR)
 bookmarksxml_DATA	= $(BOOKMARKS_PLUGIN_ID).xml
 
 EXTRA_DIST = $(bookmarksxml_DATA)
diff --git a/src/media/filesystem/Makefile.am b/src/media/filesystem/Makefile.am
index c685b85..8408251 100644
--- a/src/media/filesystem/Makefile.am
+++ b/src/media/filesystem/Makefile.am
@@ -21,8 +21,8 @@ libgrlfilesystem_la_LDFLAGS = \
 
 libgrlfilesystem_la_SOURCES = grl-filesystem.c grl-filesystem.h
 
-libdir=$(GRL_PLUGINS_DIR)
-filesystemxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir					= $(GRL_PLUGINS_DIR)
+filesystemxmldir		= $(GRL_PLUGINS_DIR)
 filesystemxml_DATA	= $(FILESYSTEM_PLUGIN_ID).xml
 
 EXTRA_DIST = $(filesystemxml_DATA)
diff --git a/src/media/flickr/Makefile.am b/src/media/flickr/Makefile.am
index 66da488..1307763 100644
--- a/src/media/flickr/Makefile.am
+++ b/src/media/flickr/Makefile.am
@@ -27,8 +27,8 @@ libgrlflickr_la_SOURCES =	\
 	gflickr.c		\
 	gflickr.h
 
-libplugindir = $(GRL_PLUGINS_DIR)
-flickrlibxmldir = $(GRL_PLUGINS_CONF_DIR)
+libplugindir		= $(GRL_PLUGINS_DIR)
+flickrlibxmldir	= $(GRL_PLUGINS_DIR)
 flickrlibxml_DATA = $(FLICKR_PLUGIN_ID).xml
 
 EXTRA_DIST = $(flickrlibxml_DATA)
diff --git a/src/media/jamendo/Makefile.am b/src/media/jamendo/Makefile.am
index 3232ac2..15ad7ce 100644
--- a/src/media/jamendo/Makefile.am
+++ b/src/media/jamendo/Makefile.am
@@ -25,8 +25,8 @@ libgrljamendo_la_SOURCES = 	\
 	grl-jamendo.c 		\
 	grl-jamendo.h
 
-libdir = $(GRL_PLUGINS_DIR)
-jamendoxmldir = $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+jamendoxmldir		= $(GRL_PLUGINS_DIR)
 jamendoxml_DATA	= $(JAMENDO_PLUGIN_ID).xml
 
 EXTRA_DIST = $(jamendoxml_DATA)
diff --git a/src/media/podcasts/Makefile.am b/src/media/podcasts/Makefile.am
index 74b87ee..0c70bc2 100644
--- a/src/media/podcasts/Makefile.am
+++ b/src/media/podcasts/Makefile.am
@@ -27,8 +27,8 @@ libgrlpodcasts_la_LDFLAGS = \
 
 libgrlpodcasts_la_SOURCES = grl-podcasts.c grl-podcasts.h
 
-libdir = $(GRL_PLUGINS_DIR)
-podcastsxmldir		= $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+podcastsxmldir		= $(GRL_PLUGINS_DIR)
 podcastsxml_DATA	= $(PODCASTS_PLUGIN_ID).xml
 
 EXTRA_DIST = $(podcastsxml_DATA)
diff --git a/src/media/shoutcast/Makefile.am b/src/media/shoutcast/Makefile.am
index 3940692..088fdd3 100644
--- a/src/media/shoutcast/Makefile.am
+++ b/src/media/shoutcast/Makefile.am
@@ -23,9 +23,8 @@ libgrlshoutcast_la_LDFLAGS = \
 
 libgrlshoutcast_la_SOURCES	 = grl-shoutcast.c grl-shoutcast.h
 
-libdir=$(GRL_PLUGINS_DIR)
-
-shoutcastxmldir		= $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+shoutcastxmldir	= $(GRL_PLUGINS_DIR)
 shoutcastxml_DATA	= $(SHOUTCAST_PLUGIN_ID).xml
 
 EXTRA_DIST = $(shoutcastxml_DATA)
diff --git a/src/media/tracker/Makefile.am b/src/media/tracker/Makefile.am
index a0d5c29..dff699a 100644
--- a/src/media/tracker/Makefile.am
+++ b/src/media/tracker/Makefile.am
@@ -22,7 +22,6 @@ libgrltracker_la_LDFLAGS = \
 libgrltracker_la_SOURCES = 		\
 	grl-tracker.c			\
 	grl-tracker.h			\
-	\
 	grl-tracker-media.c		\
 	grl-tracker-media.h		\
 	grl-tracker-media-api.c		\
@@ -32,17 +31,15 @@ libgrltracker_la_SOURCES = 		\
 	grl-tracker-media-notif.c	\
 	grl-tracker-media-notif.h	\
 	grl-tracker-media-priv.h	\
-	\
 	grl-tracker-metadata.c		\
 	grl-tracker-metadata.h		\
-	\
 	grl-tracker-request-queue.c	\
 	grl-tracker-request-queue.h	\
 	grl-tracker-utils.c		\
 	grl-tracker-utils.h
 
-libdir = $(GRL_PLUGINS_DIR)
-trackerxmldir = $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+trackerxmldir		= $(GRL_PLUGINS_DIR)
 trackerxml_DATA	= $(TRACKER_PLUGIN_ID).xml
 
 EXTRA_DIST = $(trackerxml_DATA)
diff --git a/src/media/upnp/Makefile.am b/src/media/upnp/Makefile.am
index b6b09bd..529af34 100644
--- a/src/media/upnp/Makefile.am
+++ b/src/media/upnp/Makefile.am
@@ -33,8 +33,8 @@ libgrlupnp_la_LIBADD +=	\
 
 libgrlupnp_la_SOURCES = grl-upnp.c grl-upnp.h
 
-libdir = $(GRL_PLUGINS_DIR)
-upnpxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir			= $(GRL_PLUGINS_DIR)
+upnpxmldir		= $(GRL_PLUGINS_DIR)
 upnpxml_DATA	= $(UPNP_PLUGIN_ID).xml
 
 EXTRA_DIST = $(upnpxml_DATA)
diff --git a/src/media/vimeo/Makefile.am b/src/media/vimeo/Makefile.am
index b810218..5badd48 100644
--- a/src/media/vimeo/Makefile.am
+++ b/src/media/vimeo/Makefile.am
@@ -29,8 +29,8 @@ libgrlvimeo_la_SOURCES =	\
 	gvimeo.c		\
 	gvimeo.h
 
-libdir=$(GRL_PLUGINS_DIR)
-vimeoxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir			= $(GRL_PLUGINS_DIR)
+vimeoxmldir		= $(GRL_PLUGINS_DIR)
 vimeoxml_DATA	= $(VIMEO_PLUGIN_ID).xml
 
 EXTRA_DIST = $(vimeoxml_DATA)
diff --git a/src/media/youtube/Makefile.am b/src/media/youtube/Makefile.am
index b173530..5449f3b 100644
--- a/src/media/youtube/Makefile.am
+++ b/src/media/youtube/Makefile.am
@@ -29,8 +29,8 @@ libgrlyoutube_la_LDFLAGS = \
 
 libgrlyoutube_la_SOURCES = grl-youtube.c grl-youtube.h
 
-libdir = $(GRL_PLUGINS_DIR)
-youtubexmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+youtubexmldir		= $(GRL_PLUGINS_DIR)
 youtubexml_DATA	= $(YOUTUBE_PLUGIN_ID).xml
 
 EXTRA_DIST = $(youtubexml_DATA)
diff --git a/src/metadata/fake-metadata/Makefile.am b/src/metadata/fake-metadata/Makefile.am
index e0a1b81..d5bdb0f 100644
--- a/src/metadata/fake-metadata/Makefile.am
+++ b/src/metadata/fake-metadata/Makefile.am
@@ -19,8 +19,8 @@ libgrlfakemetadata_la_LDFLAGS = \
 
 libgrlfakemetadata_la_SOURCES = grl-fake-metadata.c grl-fake-metadata.h
 
-libdir=$(GRL_PLUGINS_DIR)
-fakemetadataxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir					= $(GRL_PLUGINS_DIR)
+fakemetadataxmldir	= $(GRL_PLUGINS_DIR)
 fakemetadataxml_DATA	= $(FAKEMETADATA_PLUGIN_ID).xml
 
 EXTRA_DIST = $(fakemetadataxml_DATA)
diff --git a/src/metadata/gravatar/Makefile.am b/src/metadata/gravatar/Makefile.am
index 391795e..e9556b9 100644
--- a/src/metadata/gravatar/Makefile.am
+++ b/src/metadata/gravatar/Makefile.am
@@ -19,8 +19,8 @@ libgrlgravatar_la_LDFLAGS = \
 
 libgrlgravatar_la_SOURCES = grl-gravatar.c grl-gravatar.h
 
-libdir=$(GRL_PLUGINS_DIR)
-gravatarxmldir		= $(GRL_PLUGINS_CONF_DIR)
+libdir				= $(GRL_PLUGINS_DIR)
+gravatarxmldir		= $(GRL_PLUGINS_DIR)
 gravatarxml_DATA	= $(GRAVATAR_PLUGIN_ID).xml
 
 EXTRA_DIST = $(gravatarxml_DATA)
diff --git a/src/metadata/lastfm-albumart/Makefile.am b/src/metadata/lastfm-albumart/Makefile.am
index ad7bc6e..a902e1e 100644
--- a/src/metadata/lastfm-albumart/Makefile.am
+++ b/src/metadata/lastfm-albumart/Makefile.am
@@ -23,8 +23,8 @@ libgrllastfm_albumart_la_LDFLAGS = \
 
 libgrllastfm_albumart_la_SOURCES = grl-lastfm-albumart.c grl-lastfm-albumart.h
 
-libdir = $(GRL_PLUGINS_DIR)
-lastfmalbumartxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir						= $(GRL_PLUGINS_DIR)
+lastfmalbumartxmldir		= $(GRL_PLUGINS_DIR)
 lastfmalbumartxml_DATA	= $(LASTFM_ALBUMART_PLUGIN_ID).xml
 
 EXTRA_DIST = $(lastfmalbumartxml_DATA)
diff --git a/src/metadata/local-metadata/Makefile.am b/src/metadata/local-metadata/Makefile.am
index 6840cf3..f07b66f 100644
--- a/src/metadata/local-metadata/Makefile.am
+++ b/src/metadata/local-metadata/Makefile.am
@@ -21,8 +21,8 @@ libgrllocalmetadata_la_LDFLAGS = \
 
 libgrllocalmetadata_la_SOURCES = grl-local-metadata.c grl-local-metadata.h
 
-libdir=$(GRL_PLUGINS_DIR)
-localmetadataxmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir						= $(GRL_PLUGINS_DIR)
+localmetadataxmldir		= $(GRL_PLUGINS_DIR)
 localmetadataxml_DATA	= $(LOCALMETADATA_PLUGIN_ID).xml
 
 EXTRA_DIST = $(localmetadataxml_DATA)
diff --git a/src/metadata/metadata-store/Makefile.am b/src/metadata/metadata-store/Makefile.am
index 372f4a8..ba31e65 100644
--- a/src/metadata/metadata-store/Makefile.am
+++ b/src/metadata/metadata-store/Makefile.am
@@ -21,8 +21,8 @@ libgrlmetadatastore_la_LDFLAGS = \
 
 libgrlmetadatastore_la_SOURCES = grl-metadata-store.c grl-metadata-store.h
 
-libdir=$(GRL_PLUGINS_DIR)
-metadatastorexmldir	= $(GRL_PLUGINS_CONF_DIR)
+libdir						= $(GRL_PLUGINS_DIR)
+metadatastorexmldir		= $(GRL_PLUGINS_DIR)
 metadatastorexml_DATA	= $(METADATA_STORE_PLUGIN_ID).xml
 
 EXTRA_DIST = $(metadatastorexml_DATA)
-- 
1.7.6
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]