GNOME.org
 

[grilo-plugins/0.1.x] plugins: Don't overwrite libdir in Makefile.am

commit 502755b69199e1a7e61a966088b3f078402d5508
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Mar 27 17:03:04 2012 +0200

    plugins: Don't overwrite libdir in Makefile.am
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641357

 src/media/apple-trailers/Makefile.am     |    4 ++--
 src/media/bliptv/Makefile.am             |    4 ++--
 src/media/bookmarks/Makefile.am          |    4 ++--
 src/media/filesystem/Makefile.am         |    4 ++--
 src/media/jamendo/Makefile.am            |    4 ++--
 src/media/podcasts/Makefile.am           |    4 ++--
 src/media/shoutcast/Makefile.am          |    4 ++--
 src/media/tracker/Makefile.am            |    4 ++--
 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 ++--
 16 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/src/media/apple-trailers/Makefile.am b/src/media/apple-trailers/Makefile.am
index e5e1e6b..6eba99e 100644
--- a/src/media/apple-trailers/Makefile.am
+++ b/src/media/apple-trailers/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlappletrailers.la
+ext_LTLIBRARIES		 = libgrlappletrailers.la
 
 libgrlappletrailers_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -26,7 +26,7 @@ libgrlappletrailers_la_SOURCES =	\
 	grl-apple-trailers.c		\
 	grl-apple-trailers.h
 
-libdir						= $(GRL_PLUGINS_DIR)
+extdir						= $(GRL_PLUGINS_DIR)
 appletrailersxmldir		= $(GRL_PLUGINS_DIR)
 appletrailersxml_DATA	= $(APPLE_TRAILERS_PLUGIN_ID).xml
 
diff --git a/src/media/bliptv/Makefile.am b/src/media/bliptv/Makefile.am
index 8b3e027..8d78113 100644
--- a/src/media/bliptv/Makefile.am
+++ b/src/media/bliptv/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (C) 2011 Intel Corporation.
 # Copyright (C) 2011 Igalia S.L.
 
-lib_LTLIBRARIES		 = libgrlbliptv.la
+ext_LTLIBRARIES		 = libgrlbliptv.la
 
 libgrlbliptv_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -27,7 +27,7 @@ libgrlbliptv_la_SOURCES = 		\
 	grl-bliptv.c			\
 	grl-bliptv.h
 
-libdir 			= $(GRL_PLUGINS_DIR)
+extdir 			= $(GRL_PLUGINS_DIR)
 bliptvxmldir 	= $(GRL_PLUGINS_DIR)
 bliptvxml_DATA	= $(BLIPTV_PLUGIN_ID).xml
 
diff --git a/src/media/bookmarks/Makefile.am b/src/media/bookmarks/Makefile.am
index a0a725a..f63b1c7 100644
--- a/src/media/bookmarks/Makefile.am
+++ b/src/media/bookmarks/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES = libgrlbookmarks.la
+ext_LTLIBRARIES = libgrlbookmarks.la
 
 libgrlbookmarks_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -22,7 +22,7 @@ libgrlbookmarks_la_LDFLAGS = \
 
 libgrlbookmarks_la_SOURCES = grl-bookmarks.c grl-bookmarks.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 bookmarksxmldir	= $(GRL_PLUGINS_DIR)
 bookmarksxml_DATA	= $(BOOKMARKS_PLUGIN_ID).xml
 
diff --git a/src/media/filesystem/Makefile.am b/src/media/filesystem/Makefile.am
index 5ffd069..7825aa7 100644
--- a/src/media/filesystem/Makefile.am
+++ b/src/media/filesystem/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlfilesystem.la
+ext_LTLIBRARIES		 = libgrlfilesystem.la
 
 libgrlfilesystem_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -22,7 +22,7 @@ libgrlfilesystem_la_LDFLAGS = \
 
 libgrlfilesystem_la_SOURCES = grl-filesystem.c grl-filesystem.h
 
-libdir					= $(GRL_PLUGINS_DIR)
+extdir					= $(GRL_PLUGINS_DIR)
 filesystemxmldir		= $(GRL_PLUGINS_DIR)
 filesystemxml_DATA	= $(FILESYSTEM_PLUGIN_ID).xml
 
diff --git a/src/media/jamendo/Makefile.am b/src/media/jamendo/Makefile.am
index 48a7d09..fe1c7dd 100644
--- a/src/media/jamendo/Makefile.am
+++ b/src/media/jamendo/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrljamendo.la
+ext_LTLIBRARIES		 = libgrljamendo.la
 
 libgrljamendo_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -26,7 +26,7 @@ libgrljamendo_la_SOURCES = 	\
 	grl-jamendo.c 		\
 	grl-jamendo.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 jamendoxmldir		= $(GRL_PLUGINS_DIR)
 jamendoxml_DATA	= $(JAMENDO_PLUGIN_ID).xml
 
diff --git a/src/media/podcasts/Makefile.am b/src/media/podcasts/Makefile.am
index 826ccc1..fe3869f 100644
--- a/src/media/podcasts/Makefile.am
+++ b/src/media/podcasts/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES = libgrlpodcasts.la
+ext_LTLIBRARIES = libgrlpodcasts.la
 
 libgrlpodcasts_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -28,7 +28,7 @@ libgrlpodcasts_la_LDFLAGS = \
 
 libgrlpodcasts_la_SOURCES = grl-podcasts.c grl-podcasts.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 podcastsxmldir		= $(GRL_PLUGINS_DIR)
 podcastsxml_DATA	= $(PODCASTS_PLUGIN_ID).xml
 
diff --git a/src/media/shoutcast/Makefile.am b/src/media/shoutcast/Makefile.am
index b81ecde..c05e0ea 100644
--- a/src/media/shoutcast/Makefile.am
+++ b/src/media/shoutcast/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlshoutcast.la
+ext_LTLIBRARIES		 = libgrlshoutcast.la
 
 libgrlshoutcast_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -24,7 +24,7 @@ libgrlshoutcast_la_LDFLAGS = \
 
 libgrlshoutcast_la_SOURCES	 = grl-shoutcast.c grl-shoutcast.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 shoutcastxmldir	= $(GRL_PLUGINS_DIR)
 shoutcastxml_DATA	= $(SHOUTCAST_PLUGIN_ID).xml
 
diff --git a/src/media/tracker/Makefile.am b/src/media/tracker/Makefile.am
index d44865d..ea6aa18 100644
--- a/src/media/tracker/Makefile.am
+++ b/src/media/tracker/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrltracker.la
+ext_LTLIBRARIES		 = libgrltracker.la
 
 libgrltracker_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -39,7 +39,7 @@ libgrltracker_la_SOURCES = 		\
 	grl-tracker-utils.c		\
 	grl-tracker-utils.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 trackerxmldir		= $(GRL_PLUGINS_DIR)
 trackerxml_DATA	= $(TRACKER_PLUGIN_ID).xml
 
diff --git a/src/media/upnp/Makefile.am b/src/media/upnp/Makefile.am
index 7d6c8e8..7829b4a 100644
--- a/src/media/upnp/Makefile.am
+++ b/src/media/upnp/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES	= libgrlupnp.la
+ext_LTLIBRARIES	= libgrlupnp.la
 
 libgrlupnp_la_CFLAGS =		\
 	$(DEPS_CFLAGS)		\
@@ -34,7 +34,7 @@ libgrlupnp_la_LIBADD +=	\
 
 libgrlupnp_la_SOURCES = grl-upnp.c grl-upnp.h
 
-libdir			= $(GRL_PLUGINS_DIR)
+extdir			= $(GRL_PLUGINS_DIR)
 upnpxmldir		= $(GRL_PLUGINS_DIR)
 upnpxml_DATA	= $(UPNP_PLUGIN_ID).xml
 
diff --git a/src/media/vimeo/Makefile.am b/src/media/vimeo/Makefile.am
index 777f00f..d0ba117 100644
--- a/src/media/vimeo/Makefile.am
+++ b/src/media/vimeo/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlvimeo.la
+ext_LTLIBRARIES		 = libgrlvimeo.la
 
 libgrlvimeo_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -32,7 +32,7 @@ libgrlvimeo_la_SOURCES =	\
 	gvimeo.c		\
 	gvimeo.h
 
-libdir			= $(GRL_PLUGINS_DIR)
+extdir			= $(GRL_PLUGINS_DIR)
 vimeoxmldir		= $(GRL_PLUGINS_DIR)
 vimeoxml_DATA	= $(VIMEO_PLUGIN_ID).xml
 
diff --git a/src/media/youtube/Makefile.am b/src/media/youtube/Makefile.am
index be67ba2..5f9ffd9 100644
--- a/src/media/youtube/Makefile.am
+++ b/src/media/youtube/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES = libgrlyoutube.la
+ext_LTLIBRARIES = libgrlyoutube.la
 
 libgrlyoutube_la_CFLAGS =	\
 	$(DEPS_CFLAGS)		\
@@ -30,7 +30,7 @@ libgrlyoutube_la_LDFLAGS = \
 
 libgrlyoutube_la_SOURCES = grl-youtube.c grl-youtube.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 youtubexmldir		= $(GRL_PLUGINS_DIR)
 youtubexml_DATA	= $(YOUTUBE_PLUGIN_ID).xml
 
diff --git a/src/metadata/fake-metadata/Makefile.am b/src/metadata/fake-metadata/Makefile.am
index 52eedd3..e07ccc6 100644
--- a/src/metadata/fake-metadata/Makefile.am
+++ b/src/metadata/fake-metadata/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlfakemetadata.la
+ext_LTLIBRARIES		 = libgrlfakemetadata.la
 
 libgrlfakemetadata_la_CFLAGS =	\
 	$(DEPS_CFLAGS)
@@ -20,7 +20,7 @@ libgrlfakemetadata_la_LDFLAGS = \
 
 libgrlfakemetadata_la_SOURCES = grl-fake-metadata.c grl-fake-metadata.h
 
-libdir					= $(GRL_PLUGINS_DIR)
+extdir					= $(GRL_PLUGINS_DIR)
 fakemetadataxmldir	= $(GRL_PLUGINS_DIR)
 fakemetadataxml_DATA	= $(FAKEMETADATA_PLUGIN_ID).xml
 
diff --git a/src/metadata/gravatar/Makefile.am b/src/metadata/gravatar/Makefile.am
index c17b811..c474be6 100644
--- a/src/metadata/gravatar/Makefile.am
+++ b/src/metadata/gravatar/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES = libgrlgravatar.la
+ext_LTLIBRARIES = libgrlgravatar.la
 
 libgrlgravatar_la_CFLAGS =	\
 	$(DEPS_CFLAGS)
@@ -20,7 +20,7 @@ libgrlgravatar_la_LDFLAGS = \
 
 libgrlgravatar_la_SOURCES = grl-gravatar.c grl-gravatar.h
 
-libdir				= $(GRL_PLUGINS_DIR)
+extdir				= $(GRL_PLUGINS_DIR)
 gravatarxmldir		= $(GRL_PLUGINS_DIR)
 gravatarxml_DATA	= $(GRAVATAR_PLUGIN_ID).xml
 
diff --git a/src/metadata/lastfm-albumart/Makefile.am b/src/metadata/lastfm-albumart/Makefile.am
index 2fca1e7..f90cbbb 100644
--- a/src/metadata/lastfm-albumart/Makefile.am
+++ b/src/metadata/lastfm-albumart/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES = libgrllastfm-albumart.la
+ext_LTLIBRARIES = libgrllastfm-albumart.la
 
 libgrllastfm_albumart_la_CFLAGS =	\
 	$(DEPS_CFLAGS) 			\
@@ -24,7 +24,7 @@ libgrllastfm_albumart_la_LDFLAGS = \
 
 libgrllastfm_albumart_la_SOURCES = grl-lastfm-albumart.c grl-lastfm-albumart.h
 
-libdir						= $(GRL_PLUGINS_DIR)
+extdir						= $(GRL_PLUGINS_DIR)
 lastfmalbumartxmldir		= $(GRL_PLUGINS_DIR)
 lastfmalbumartxml_DATA	= $(LASTFM_ALBUMART_PLUGIN_ID).xml
 
diff --git a/src/metadata/local-metadata/Makefile.am b/src/metadata/local-metadata/Makefile.am
index e8ec945..afc5312 100644
--- a/src/metadata/local-metadata/Makefile.am
+++ b/src/metadata/local-metadata/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010-2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrllocalmetadata.la
+ext_LTLIBRARIES		 = libgrllocalmetadata.la
 
 libgrllocalmetadata_la_CFLAGS =	\
 	$(DEPS_CFLAGS) \
@@ -22,7 +22,7 @@ libgrllocalmetadata_la_LDFLAGS = \
 
 libgrllocalmetadata_la_SOURCES = grl-local-metadata.c grl-local-metadata.h
 
-libdir						= $(GRL_PLUGINS_DIR)
+extdir						= $(GRL_PLUGINS_DIR)
 localmetadataxmldir		= $(GRL_PLUGINS_DIR)
 localmetadataxml_DATA	= $(LOCALMETADATA_PLUGIN_ID).xml
 
diff --git a/src/metadata/metadata-store/Makefile.am b/src/metadata/metadata-store/Makefile.am
index 621935f..1d4e1b5 100644
--- a/src/metadata/metadata-store/Makefile.am
+++ b/src/metadata/metadata-store/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
 
-lib_LTLIBRARIES		 = libgrlmetadatastore.la
+ext_LTLIBRARIES		 = libgrlmetadatastore.la
 
 libgrlmetadatastore_la_CFLAGS =	\
 	$(DEPS_CFLAGS) \
@@ -22,7 +22,7 @@ libgrlmetadatastore_la_LDFLAGS = \
 
 libgrlmetadatastore_la_SOURCES = grl-metadata-store.c grl-metadata-store.h
 
-libdir						= $(GRL_PLUGINS_DIR)
+extdir						= $(GRL_PLUGINS_DIR)
 metadatastorexmldir		= $(GRL_PLUGINS_DIR)
 metadatastorexml_DATA	= $(METADATA_STORE_PLUGIN_ID).xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]