Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Requires autoconf tool later than 2.61
AC_PREREQ(2.69)

AC_INIT([agm],1.0.1)
AC_INIT([agm],1.0.0)
# Does not strictly follow GNU Coding standards
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
LT_INIT
Expand All @@ -16,6 +16,13 @@ AC_PROG_LIBTOOL
AM_PROG_AR
AC_PROG_CXX

m4_define([LT_MAJOR], [1])
m4_define([LT_MINOR], [0])
m4_define([LT_PATCH], [0])

AC_SUBST([LT_VERSION], LT_MAJOR.LT_MINOR.LT_PATCH)
AC_SUBST([LT_VERSION_NUMBER], LT_MAJOR:LT_MINOR:LT_PATCH)

AC_ARG_WITH([syslog],
AS_HELP_STRING([use syslog (default is no)]),
[with_syslog=$withval],
Expand Down
6 changes: 3 additions & 3 deletions plugins/tinyalsa/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AM_CFLAGS += -Wl,-z,defs
lib_LTLIBRARIES = libagm_pcm_plugin.la
libagm_pcm_plugin_la_SOURCES = src/agm_pcm_plugin.c
libagm_pcm_plugin_la_CFLAGS = $(AM_CFLAGS)
libagm_pcm_plugin_la_LDFLAGS = -avoid-version -shared -L$(top_builddir)/snd_parser/.libs
libagm_pcm_plugin_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@ -L$(top_builddir)/snd_parser/.libs
libagm_pcm_plugin_la_LIBADD = -ltinyalsa -lsndcardparser

if AGM_NO_IPC
Expand All @@ -33,7 +33,7 @@ endif
#lib_LTLIBRARIES += libtinycompress_module_agm.la
#libtinycompress_module_agm_la_SOURCES = src/agm_compress_plugin.c
#libtinycompress_module_agm_la_CFLAGS = $(AM_CFLAGS)
#libtinycompress_module_agm_la_LDFLAGS = -avoid-version -shared -L$(top_builddir)/snd_parser/.libs
#libtinycompress_module_agm_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@ -L$(top_builddir)/snd_parser/.libs
#libtinycompress_module_agm_la_LIBADD = -ltinyalsa -ltinycompress -lpthread -lsndcardparser
#if AGM_NO_IPC
#libtinycompress_module_agm_la_CFLAGS += -DAGM_NO_IPC
Expand All @@ -48,7 +48,7 @@ lib_LTLIBRARIES += libagm_mixer_plugin.la
libagm_mixer_plugin_la_SOURCES = src/agm_mixer_plugin.c
libagm_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
libagm_mixer_plugin_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
libagm_mixer_plugin_la_LDFLAGS =-avoid-version -shared -L$(top_builddir)/snd_parser/.libs
libagm_mixer_plugin_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@ -L$(top_builddir)/snd_parser/.libs
libagm_mixer_plugin_la_LIBADD = -ltinyalsa -lsndcardparser $(GLIB_LIBS)
if AGM_NO_IPC
libagm_mixer_plugin_la_CFLAGS += -DAGM_NO_IPC
Expand Down
2 changes: 1 addition & 1 deletion plugins/tinyalsa/agmplugin.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ includedir=@includedir@

Name: agmplugin
Description: agm plugin library
Version: @VERSION@
Version: @LT_VERSION@
Libs: -L${libdir} -lagmplugin
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion plugins/tinyalsa/test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AM_CFLAGS += -DBACKEND_CONF_FILE=\"/etc/backend_conf.xml\"
lib_LTLIBRARIES = libagmmixer.la
libagmmixer_la_SOURCES = agmmixer.c
libagmmixer_la_CFLAGS = $(AM_CFLAGS)
libagmmixer_la_LDFLAGS = -avoid-version -shared
libagmmixer_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
libagmmixer_la_LIBADD = -ltinyalsa -ldl -lexpat @GLIB_LIBS@

bin_PROGRAMS = agmplay
Expand Down
2 changes: 1 addition & 1 deletion plugins/tinyalsa/test/agmtest.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ includedir=@includedir@

Name: agmtest
Description: agm test tool
Version: @VERSION@
Version: @LT_VERSION@
Libs: -L${libdir}
Cflags: -I${includedir}/agmtest
2 changes: 1 addition & 1 deletion service/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ libagm_la_CFLAGS += -DARE_ON_APPS
endif

libagm_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
libagm_la_LDFLAGS += -module -shared -avoid-version
libagm_la_LDFLAGS += -module -shared -version-number @LT_VERSION_NUMBER@
2 changes: 1 addition & 1 deletion service/agm.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ includedir=@includedir@

Name: agm
Description: agm library
Version: @VERSION@
Version: @LT_VERSION@
2 changes: 1 addition & 1 deletion snd_parser/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AM_CFLAGS += -Wl,-z,defs
lib_LTLIBRARIES = libsndcardparser.la
libsndcardparser_la_SOURCES = src/snd-card-parser.c
libsndcardparser_la_LIBADD = -lexpat -lpthread
libsndcardparser_la_LDFLAGS = -avoid-version -shared
libsndcardparser_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
libsndcardparser_la_CFLAGS = $(AM_CFLAGS)
if USE_GLIB
libsndcardparser_la_LIBADD += $(GLIB_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion snd_parser/sndparser.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ includedir=@includedir@

Name: sndparser
Description: sndparser library
Version: @VERSION@
Version: @LT_VERSION@
Libs: -L${libdir}
Cflags: -I${includedir}/sndparser