From c90a5cad246b65cd94948999e6c5c45ddac51363 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 10 Jul 2007 02:09:38 +0000 Subject: [PATCH] bump libtool number in prep for release --- include/FLAC++/export.h | 31 ++++++++++++++++++++++++++++--- include/FLAC/export.h | 10 +++++++--- src/libFLAC++/Makefile.am | 2 +- src/libFLAC/Makefile.am | 2 +- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h index a31b8317..1c258b79 100644 --- a/include/FLAC++/export.h +++ b/include/FLAC++/export.h @@ -32,6 +32,29 @@ #ifndef FLACPP__EXPORT_H #define FLACPP__EXPORT_H +/** \file include/FLAC++/export.h + * + * \brief + * This module contains #defines and symbols for exporting function + * calls, and providing version information and compiled-in features. + * + * See the \link flacpp_export export \endlink module. + */ + +/** \defgroup flacpp_export FLAC++/export.h: export symbols + * \ingroup flacpp + * + * \brief + * This module contains #defines and symbols for exporting function + * calls, and providing version information and compiled-in features. + * + * If you are compiling with MSVC and will link to the static library + * (libFLAC++.lib) you should define FLAC__NO_DLL in your project to + * make sure the symbols are exported properly. + * + * \{ + */ + #if defined(FLAC__NO_DLL) || !defined(_MSC_VER) #define FLACPP_API @@ -48,8 +71,10 @@ /* These #defines will mirror the libtool-based library version number, see * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning */ -#define FLACPP_API_VERSION_CURRENT 6 -#define FLACPP_API_VERSION_REVISION 1 -#define FLACPP_API_VERSION_AGE 0 +#define FLACPP_API_VERSION_CURRENT 7 +#define FLACPP_API_VERSION_REVISION 0 +#define FLACPP_API_VERSION_AGE 1 + +/* \} */ #endif diff --git a/include/FLAC/export.h b/include/FLAC/export.h index 98d2d288..cdeaead6 100644 --- a/include/FLAC/export.h +++ b/include/FLAC/export.h @@ -48,6 +48,10 @@ * This module contains #defines and symbols for exporting function * calls, and providing version information and compiled-in features. * + * If you are compiling with MSVC and will link to the static library + * (libFLAC.lib) you should define FLAC__NO_DLL in your project to + * make sure the symbols are exported properly. + * * \{ */ @@ -67,9 +71,9 @@ /** These #defines will mirror the libtool-based library version number, see * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning */ -#define FLAC_API_VERSION_CURRENT 8 -#define FLAC_API_VERSION_REVISION 1 /**< see above */ -#define FLAC_API_VERSION_AGE 0 /**< see above */ +#define FLAC_API_VERSION_CURRENT 9 +#define FLAC_API_VERSION_REVISION 0 /**< see above */ +#define FLAC_API_VERSION_AGE 1 /**< see above */ #ifdef __cplusplus extern "C" { diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index b148c9e0..01642fed 100644 --- a/src/libFLAC++/Makefile.am +++ b/src/libFLAC++/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST = \ libFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention -libFLAC___la_LDFLAGS = -version-info 6:1:0 +libFLAC___la_LDFLAGS = -version-info 7:0:1 libFLAC___la_LIBADD = ../libFLAC/libFLAC.la libFLAC___la_SOURCES = \ diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 9c4773aa..d26dffa3 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -94,7 +94,7 @@ extra_ogg_sources = \ ogg_mapping.c endif # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention -libFLAC_la_LDFLAGS = -version-info 8:1:0 -lm $(LOCAL_EXTRA_LDFLAGS) +libFLAC_la_LDFLAGS = -version-info 9:0:1 -lm $(LOCAL_EXTRA_LDFLAGS) libFLAC_la_SOURCES = \ bitmath.c \ bitreader.c \