From 2b04263bedaf9efdfb35a4bf590a3153b2a1f3e7 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Tue, 31 Jul 2007 02:44:29 +0000 Subject: [PATCH] Actually, according to current:revision:age practice, the next release should be 0.8.0 since new functions have been added since 0.7.22. --- configure.ac | 20 ++++++++++++++++++-- lib/buffer.c | 2 +- lib/calib.c | 8 ++++---- lib/dio.c | 4 ++-- lib/get.c | 2 +- lib/version_script | 2 +- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 7c0ba9e..705e78b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,28 @@ -AC_INIT([comedilib], [0.7.23]) +AC_INIT([comedilib], [0.8.0]) AC_CANONICAL_TARGET([]) AC_CONFIG_AUX_DIR([.]) #COMEDILIB_DEBUG="-Wall -Werror" COMEDILIB_DEBUG="-Wall" AM_INIT_AUTOMAKE([-Wall -Werror]) -AS_LIBTOOL(COMEDILIB, 7, 23, 7) + +# libtool version: current:revision:age +# +# If the library source code has changed at all since the last update, then +# increment revision (`c:r:a' becomes `c:r+1:a'). +# +# If any interfaces have been added, removed, or changed since the last update, +# increment current, and set revision to 0. +# +# If any interfaces have been added since the last public release, then +# increment age. +# +# If any interfaces have been removed since the last public release, then set +# age to 0. +# +# AS_LIBTOOL arguments are (prefix, current, revision, age) +AS_LIBTOOL(COMEDILIB, 8, 0, 8) AM_CONFIG_HEADER(config.h) diff --git a/lib/buffer.c b/lib/buffer.c index 9ebe9f2..fdd2eae 100644 --- a/lib/buffer.c +++ b/lib/buffer.c @@ -93,7 +93,7 @@ int _comedi_mark_buffer_read(comedi_t *it, unsigned int subdev, unsigned int byt return bi.buf_write_count - bi.buf_read_count; } -EXPORT_ALIAS_DEFAULT(_comedi_mark_buffer_written,comedi_mark_buffer_written,0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_mark_buffer_written,comedi_mark_buffer_written,0.8.0); int _comedi_mark_buffer_written(comedi_t *it, unsigned int subdev, unsigned int bytes) { int ret; diff --git a/lib/calib.c b/lib/calib.c index 52d281e..b3115e4 100644 --- a/lib/calib.c +++ b/lib/calib.c @@ -246,7 +246,7 @@ int _comedi_apply_calibration( comedi_t *dev, unsigned int subdev, unsigned int return retval; } -EXPORT_ALIAS_DEFAULT(_comedi_get_hardcal_converter, comedi_get_hardcal_converter, 0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_get_hardcal_converter, comedi_get_hardcal_converter, 0.8.0); int _comedi_get_hardcal_converter( comedi_t *dev, unsigned subdevice, unsigned channel, unsigned range, enum comedi_conversion_direction direction, @@ -279,7 +279,7 @@ int _comedi_get_hardcal_converter( return 0; } -EXPORT_ALIAS_DEFAULT(_comedi_get_softcal_converter, comedi_get_softcal_converter, 0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_get_softcal_converter, comedi_get_softcal_converter, 0.8.0); int _comedi_get_softcal_converter( unsigned subdevice, unsigned channel, unsigned range, enum comedi_conversion_direction direction, @@ -328,14 +328,14 @@ static double apply_polynomial(const comedi_polynomial_t *polynomial, double inp return value; } -EXPORT_ALIAS_DEFAULT(_comedi_to_physical, comedi_to_physical, 0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_to_physical, comedi_to_physical, 0.8.0); double _comedi_to_physical(lsampl_t data, const comedi_polynomial_t *conversion_polynomial) { return apply_polynomial(conversion_polynomial, data); } -EXPORT_ALIAS_DEFAULT(_comedi_from_physical, comedi_from_physical, 0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_from_physical, comedi_from_physical, 0.8.0); lsampl_t _comedi_from_physical(double data, const comedi_polynomial_t *conversion_polynomial) { diff --git a/lib/dio.c b/lib/dio.c index 874ab6e..65b07a4 100644 --- a/lib/dio.c +++ b/lib/dio.c @@ -79,7 +79,7 @@ int _comedi_dio_config(comedi_t *it,unsigned int subdev,unsigned int chan,unsign } } -EXPORT_ALIAS_DEFAULT(_comedi_dio_get_config, comedi_dio_get_config, 0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_dio_get_config, comedi_dio_get_config, 0.8.0); int _comedi_dio_get_config(comedi_t *it,unsigned int subdev, unsigned int chan, unsigned int *io) { subdevice *s; @@ -208,7 +208,7 @@ int _comedi_dio_write(comedi_t *it,unsigned int subdev,unsigned int chan, } } -EXPORT_ALIAS_DEFAULT(_comedi_dio_bitfield2,comedi_dio_bitfield2,0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_dio_bitfield2,comedi_dio_bitfield2,0.8.0); int _comedi_dio_bitfield2(comedi_t *it, unsigned int subdev, unsigned int mask, unsigned int *bits, unsigned base_channel) { int ret; diff --git a/lib/get.c b/lib/get.c index 36409ad..00a0375 100644 --- a/lib/get.c +++ b/lib/get.c @@ -79,7 +79,7 @@ int _comedi_get_subdevice_flags_old(comedi_t *it,unsigned int subd) return it->subdevices[subd].subd_flags; } -EXPORT_ALIAS_DEFAULT(_comedi_get_subdevice_flags,comedi_get_subdevice_flags,0.7.23); +EXPORT_ALIAS_DEFAULT(_comedi_get_subdevice_flags,comedi_get_subdevice_flags,0.8.0); int _comedi_get_subdevice_flags(comedi_t *it,unsigned int subd) { comedi_subdinfo *s; diff --git a/lib/version_script b/lib/version_script index 3b238cc..fc40d3a 100644 --- a/lib/version_script +++ b/lib/version_script @@ -81,7 +81,7 @@ v0.7.20 { } v0.7.19; -v0.7.23 { +v0.8.0 { global: comedi_from_physical; comedi_dio_bitfield2; -- 2.26.2