[grilo-plugins] local-metadata: rename localmetadata references to local-metadata
- From: Juan A. Suárez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] local-metadata: rename localmetadata references to local-metadata
- Date: Mon, 6 Feb 2017 08:59:40 +0000 (UTC)
commit f5e77c5850b4af698fb518155d1f335a7f2c92f8
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Sun Dec 11 16:51:39 2016 +0100
local-metadata: rename localmetadata references to local-metadata
While source name is local-metadata, we use localmetadata in some other
places, like '--enable/disable-localmetadata'.
So let's add some coherence and use always local-metadata.
https://bugzilla.gnome.org/show_bug.cgi?id=775957
Makefile.am | 2 +-
configure.ac | 34 +++++++++++++++---------------
src/Makefile.am | 2 +-
src/local-metadata/Makefile.am | 4 +-
src/local-metadata/grl-local-metadata.c | 2 +-
tests/Makefile.am | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 261cff7..6802ef6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bookmarks \
--enable-freebox \
--enable-gravatar \
--enable-jamendo \
- --enable-localmetadata \
+ --enable-local-metadata \
--enable-lua-factory \
--enable-magnatune \
--enable-metadata-store \
diff --git a/configure.ac b/configure.ac
index c2e6e23..800cb59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -920,44 +920,44 @@ AC_SUBST(DEPS_RAITV_LIBS)
# BUILD LOCAL METADATA PLUGIN
# ----------------------------------------------------------
-AC_ARG_ENABLE(localmetadata,
- AC_HELP_STRING([--enable-localmetadata],
+AC_ARG_ENABLE(local-metadata,
+ AC_HELP_STRING([--enable-local-metadata],
[enable local-metadata plugin (default: auto)]),
[
case "$enableval" in
yes)
if test "x$HAVE_GIO" = "xno"; then
- AC_MSG_ERROR([gio-2.0 not found, install it or use --disable-localmetadata])
+ AC_MSG_ERROR([gio-2.0 not found, install it or use --disable-local-metadata])
fi
if test "x$HAVE_MEDIAART" = "xno"; then
- AC_MSG_ERROR([libmediaart not found, install it or use --disable-localmetadata])
+ AC_MSG_ERROR([libmediaart not found, install it or use --disable-local-metadata])
fi
;;
esac
],
[
if test "x$HAVE_GIO" = "xyes" -a "x$HAVE_MEDIAART" = "xyes"; then
- enable_localmetadata=yes
+ enable_local_metadata=yes
else
- enable_localmetadata=no
+ enable_local_metadata=no
fi
])
-AM_CONDITIONAL([LOCALMETADATA_PLUGIN], [test "x$enable_localmetadata" = "xyes"])
-GRL_PLUGINS_ALL="$GRL_PLUGINS_ALL localmetadata"
-if test "x$enable_localmetadata" = "xyes"
+AM_CONDITIONAL([LOCAL_METADATA_PLUGIN], [test "x$enable_local_metadata" = "xyes"])
+GRL_PLUGINS_ALL="$GRL_PLUGINS_ALL local-metadata"
+if test "x$enable_local_metadata" = "xyes"
then
- GRL_PLUGINS_ENABLED="$GRL_PLUGINS_ENABLED localmetadata"
+ GRL_PLUGINS_ENABLED="$GRL_PLUGINS_ENABLED local-metadata"
fi
-LOCALMETADATA_PLUGIN_ID="grl-local-metadata"
-AC_SUBST(LOCALMETADATA_PLUGIN_ID)
-AC_DEFINE_UNQUOTED([LOCALMETADATA_PLUGIN_ID], ["$LOCALMETADATA_PLUGIN_ID"], [Local metadata plugin ID])
+LOCAL_METADATA_PLUGIN_ID="grl-local-metadata"
+AC_SUBST(LOCAL_METADATA_PLUGIN_ID)
+AC_DEFINE_UNQUOTED([LOCAL_METADATA_PLUGIN_ID], ["$LOCAL_METADATA_PLUGIN_ID"], [Local metadata plugin ID])
-DEPS_LOCALMETADATA_CFLAGS="$DEPS_CFLAGS $GIO_CFLAGS $MEDIAART_CFLAGS"
-AC_SUBST(DEPS_LOCALMETADATA_CFLAGS)
-DEPS_LOCALMETADATA_LIBS="$DEPS_LIBS $GIO_LIBS $MEDIAART_LIBS"
-AC_SUBST(DEPS_LOCALMETADATA_LIBS)
+DEPS_LOCAL_METADATA_CFLAGS="$DEPS_CFLAGS $GIO_CFLAGS $MEDIAART_CFLAGS"
+AC_SUBST(DEPS_LOCAL_METADATA_CFLAGS)
+DEPS_LOCAL_METADATA_LIBS="$DEPS_LIBS $GIO_LIBS $MEDIAART_LIBS"
+AC_SUBST(DEPS_LOCAL_METADATA_LIBS)
# ----------------------------------------------------------
# BUILD DLEYNA PLUGIN
diff --git a/src/Makefile.am b/src/Makefile.am
index 3749ccc..27b05c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ if JAMENDO_PLUGIN
SUBDIRS += jamendo
endif
-if LOCALMETADATA_PLUGIN
+if LOCAL_METADATA_PLUGIN
SUBDIRS += local-metadata
endif
diff --git a/src/local-metadata/Makefile.am b/src/local-metadata/Makefile.am
index 261b6d7..8f71042 100644
--- a/src/local-metadata/Makefile.am
+++ b/src/local-metadata/Makefile.am
@@ -10,13 +10,13 @@ include $(top_srcdir)/gtester.mk
ext_LTLIBRARIES = libgrllocalmetadata.la
libgrllocalmetadata_la_CFLAGS = \
- $(DEPS_LOCALMETADATA_CFLAGS) \
+ $(DEPS_LOCAL_METADATA_CFLAGS) \
-DG_LOG_DOMAIN=\"GrlLocalMetadata\" \
-DLOCALEDIR=\"$(localedir)\"
libgrllocalmetadata_la_LIBADD = \
- $(DEPS_LOCALMETADATA_LIBS)
+ $(DEPS_LOCAL_METADATA_LIBS)
libgrllocalmetadata_la_LDFLAGS = \
-no-undefined \
diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
index 50f9f81..8c641b0 100644
--- a/src/local-metadata/grl-local-metadata.c
+++ b/src/local-metadata/grl-local-metadata.c
@@ -110,7 +110,7 @@ grl_local_metadata_source_plugin_init (GrlRegistry *registry,
GRL_PLUGIN_DEFINE (GRL_MAJOR,
GRL_MINOR,
- LOCALMETADATA_PLUGIN_ID,
+ LOCAL_METADATA_PLUGIN_ID,
"Local Metadata Provider",
"A plugin that gets simple-to-obtain metadata from the local filesystem",
"Igalia S.L.",
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 07eabb7..7db9521 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@ if DLEYNA_PLUGIN
SUBDIRS += dleyna
endif
-if LOCALMETADATA_PLUGIN
+if LOCAL_METADATA_PLUGIN
if LUA_FACTORY_PLUGIN
SUBDIRS += local-metadata
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]