From 3cde19f3f84212d436ce4fbfc26ee29ed29a510f Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Sat, 3 Nov 2007 15:31:05 +0100 Subject: [PATCH] Fix versioning --- configure.ac | 16 ++++++++++++++-- src/Makefile.am | 5 ----- src/main.c | 21 +++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index d580b69..0b1a8df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,18 @@ +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_INIT(src) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([gmpc-random-playlist], [0.15.4.99],qball@qballcow.nl) +AM_INIT_AUTOMAKE([gmpc-random-playlist], [plugin_version],qball@qballcow.nl) + +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 @@ -16,7 +28,7 @@ PKG_CHECK_MODULES([gmpcrandom_playlist], libxml-2.0 gmodule-2.0 libmpd >= 0.14.99 - gmpc >= 0.15.4.99 + gmpc >= 0.15.4.100 ]) AC_SUBST(gmpcrandom_playlist_LIBS) AC_SUBST(gmpcrandom_playlist_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index edc42ac..de539f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,8 +9,3 @@ librandomplaylist_la_SOURCES=\ librandomplaylist_la_LIBADD= @gmpcrandom_playlist_LIBS@ librandomplaylist_la_CFLAGS= @gmpcrandom_playlist_CFLAGS@ -Wall -Wmissing-declarations librandomplaylist_la_LDFLAGS= -module -avoid-version - -install: - mkdir -p ${DESTDIR}${libdir} - if test -f .libs/librandomplaylist.so; then cp .libs/librandomplaylist.so ${DESTDIR}${libdir}; fi - if test -f .libs/librandomplaylist.dll; then cp .libs/librandomplaylist.dll ${DESTDIR}${libdir}; fi diff --git a/src/main.c b/src/main.c index e71befd..6fcf58a 100644 --- a/src/main.c +++ b/src/main.c @@ -6,6 +6,7 @@ #include #include #include +#include /* External pointer + function, there internal from gmpc */ extern GladeXML *pl3_xml; @@ -79,19 +80,11 @@ gmpcPlBrowserPlugin rp_gpb = { gmpcPlugin plugin = { - "Random Playlist", - {0,0,3}, - GMPC_PLUGIN_PL_BROWSER, - 0, /* plugin id */ - NULL, /* path to plugin */ - NULL, /* initialization */ - NULL, /* Destroy */ - &rp_gpb, /* browser intergration */ - NULL, /* status changed */ - NULL, /* connection changed */ - NULL, /* preferences */ - NULL, /* MetaData */ - get_enabled, - set_enabled + .name = "Random Playlist", + .version = {PLUGIN_MAJOR_VERSION,PLUGIN_MINOR_VERSION,PLUGIN_MICRO_VERSION}, + .plugin_type = GMPC_PLUGIN_PL_BROWSER, + .browser = &rp_gpb, /* browser intergration */ + .get_enabled = get_enabled, + .set_enabled = set_enabled }; int plugin_api_version = PLUGIN_API_VERSION; -- 2.11.4.GIT