From 8e50b7c68f4e0a10d0d954f2d38fc1e5b0c37c5d Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Sat, 3 Nov 2007 15:20:13 +0100 Subject: [PATCH] Fix versioning --- configure.ac | 16 ++++++++++++++-- src/Makefile.am | 6 ------ src/plugin.c | 3 ++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 41eb636..9a5c409 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,20 @@ +m4_define([plugin_major_version], [0]) +m4_define([plugin_minor_version], [15]) +m4_define([plugin_micro_version], [4]) +m4_define([plugin_nano_version], [100]) +m4_define([plugin_version],[plugin_major_version.plugin_minor_version.plugin_micro_version.plugin_nano_version]) + + AC_PREREQ(2.58) AC_INIT(src) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([gmpc-lyrics], [0.15.4.99],sam@bulix.org) +AM_INIT_AUTOMAKE([gmpc-lyrics], [plugin_version],sam@bulix.org) + +AC_DEFINE(PLUGIN_MAJOR_VERSION, plugin_major_version, ["Major version of plugin"]) +AC_DEFINE(PLUGIN_MINOR_VERSION, plugin_minor_version, ["Minor version of plugin"]) +AC_DEFINE(PLUGIN_MICRO_VERSION, plugin_micro_version, ["Micro version of plugin"]) +AC_DEFINE(PLUGIN_NANO_VERSION, plugin_nano_version, ["Nano version of plugin"]) AC_PROG_CC AM_DISABLE_STATIC @@ -17,7 +29,7 @@ PKG_CHECK_MODULES([gmpclyrics], gmodule-2.0 libxml-2.0 libmpd >= 0.14.99 - gmpc >= 0.15.4.99 + gmpc >= 0.15.4.100 ]) AC_SUBST(gmpclyrics_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index 032f081..7680744 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,9 +11,3 @@ lyricsplugin_la_CFLAGS= @gmpclyrics_CFLAGS@ -Wmissing-declarations -Wall lyricsplugin_la_LDFLAGS= -module -avoid-version EXTRA_DIST= gmpc-lyrics.h - -install: - @$(MAKE) - mkdir -p ${DESTDIR}${libdir} - if test -f .libs/lyricsplugin.so; then cp .libs/lyricsplugin.so ${DESTDIR}${libdir}; fi - if test -f .libs/lyricsplugin.dll; then cp .libs/lyricsplugin.dll ${DESTDIR}${libdir}; fi diff --git a/src/plugin.c b/src/plugin.c index 377e322..c18a8a8 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -19,6 +19,7 @@ */ #include "gmpc-lyrics.h" +#include #define LYRICS_FROM "\n\nLyric from " @@ -74,7 +75,7 @@ gmpcPlugin plugin = { /** Name */ .name = "Lyrics fetcher", /** Version */ - .version = {0,15,0}, + .version = {PLUGIN_MAJOR_VERSION,PLUGIN_MINOR_VERSION,PLUGIN_MICRO_VERSION}, /** Plugin type */ .plugin_type = GMPC_PLUGIN_META_DATA, /** initialize function */ -- 2.11.4.GIT