thorvald at natvig.com
2009-Nov-17 23:09 UTC
[CELT-dev] [PATCH] Change name of libcelt to libceltXYZ
From: Thorvald Natvig <slicer at users.sourceforge.net>
---
celt.pc.in | 2 +-
configure.ac | 2 ++
libcelt/Makefile.am | 12 ++++++------
tests/Makefile.am | 2 +-
tools/Makefile.am | 4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/celt.pc.in b/celt.pc.in
index 98cc008..67a830b 100644
--- a/celt.pc.in
+++ b/celt.pc.in
@@ -10,5 +10,5 @@ Description: CELT is a low-delay audio codec
Version: @CELT_VERSION@
Requires:
Conflicts:
-Libs: -L${libdir} -lcelt -lm
+Libs: -L${libdir} -lcelt at LIBCELT_SUFFIX@ -lm
Cflags: -I${includedir}
diff --git a/configure.ac b/configure.ac
index 4f13d7e..d5e31a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ CELT_MINOR_VERSION=7
CELT_MICRO_VERSION=0
CELT_EXTRA_VERSION
CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
+LIBCELT_SUFFIX=${CELT_MAJOR_VERSION}${CELT_MINOR_VERSION}${CELT_MICRO_VERSION}
CELT_LT_CURRENT=0
CELT_LT_REVISION=0
@@ -17,6 +18,7 @@ CELT_LT_AGE=0
AC_SUBST(CELT_LT_CURRENT)
AC_SUBST(CELT_LT_REVISION)
AC_SUBST(CELT_LT_AGE)
+AC_SUBST(LIBCELT_SUFFIX)
# For automake.
VERSION=$CELT_VERSION
diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am
index 7c574cc..c4f3787 100644
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -11,17 +11,17 @@ TESTS = match-test.sh
noinst_SCRIPTS = match-test.sh
-lib_LTLIBRARIES = libcelt.la
+lib_LTLIBRARIES = libcelt at LIBCELT_SUFFIX@.la
# Sources for compilation in the library
-libcelt_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \
+libcelt at LIBCELT_SUFFIX@_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h
entcode.c \
entdec.c entenc.c header.c kfft_single.c kiss_fft.c kiss_fftr.c laplace.c
mdct.c \
modes.c pitch.c psy.c quant_bands.c rangedec.c rangeenc.c rate.c \
vq.c
#noinst_HEADERS
-libcelt_la_LDFLAGS = -version-info
@CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
+libcelt at LIBCELT_SUFFIX@_la_LDFLAGS = -version-info
@CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
noinst_HEADERS = _kiss_fft_guts.h arch.h bands.h fixed_c5x.h fixed_c6x.h \
cwrs.h ecintrin.h entcode.h entdec.h entenc.h fixed_generic.h float_cast.h \
@@ -31,9 +31,9 @@ noinst_HEADERS = _kiss_fft_guts.h arch.h bands.h fixed_c5x.h
fixed_c6x.h \
noinst_PROGRAMS = testcelt dump_modes
testcelt_SOURCES = testcelt.c
-testcelt_LDADD = libcelt.la
+testcelt_LDADD = libcelt at LIBCELT_SUFFIX@.la
INCLUDES =
-#libcelt_la_LIBADD =
+#libcelt at LIBCELT_SUFFIX@_la_LIBADD
dump_modes_SOURCES = dump_modes.c
-dump_modes_LDADD = libcelt.la
+dump_modes_LDADD = libcelt at LIBCELT_SUFFIX@.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61e8f28..05ebd30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,4 +15,4 @@ mdct_test_SOURCES = mdct-test.c
#rotation_test_SOURCES = rotation-test.c
mathops_test_SOURCES = mathops-test.c
tandem_test_SOURCES = tandem-test.c
-tandem_test_LDADD = $(top_builddir)/libcelt/libcelt.la
+tandem_test_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c7678b6..65099ce 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@ noinst_HEADERS = wav_io.h
bin_PROGRAMS = celtenc celtdec
celtenc_SOURCES = celtenc.c wav_io.c skeleton.c
-celtenc_LDADD = $(top_builddir)/libcelt/libcelt.la $(OGG_LIBS)
+celtenc_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la
$(OGG_LIBS)
celtdec_SOURCES = celtdec.c wav_io.c
-celtdec_LDADD = $(top_builddir)/libcelt/libcelt.la $(OGG_LIBS)
+celtdec_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la
$(OGG_LIBS)
--
1.6.4
Jean-Marc Valin
2009-Nov-18 02:50 UTC
[CELT-dev] [PATCH] Change name of libcelt to libceltXYZ
I think that's the best way of handling the CELT versioning until the bit-stream (and API) stabilize. Anyone disagrees? Jean-Marc thorvald at natvig.com a ?crit :> From: Thorvald Natvig <slicer at users.sourceforge.net> > > --- > celt.pc.in | 2 +- > configure.ac | 2 ++ > libcelt/Makefile.am | 12 ++++++------ > tests/Makefile.am | 2 +- > tools/Makefile.am | 4 ++-- > 5 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/celt.pc.in b/celt.pc.in > index 98cc008..67a830b 100644 > --- a/celt.pc.in > +++ b/celt.pc.in > @@ -10,5 +10,5 @@ Description: CELT is a low-delay audio codec > Version: @CELT_VERSION@ > Requires: > Conflicts: > -Libs: -L${libdir} -lcelt -lm > +Libs: -L${libdir} -lcelt at LIBCELT_SUFFIX@ -lm > Cflags: -I${includedir} > diff --git a/configure.ac b/configure.ac > index 4f13d7e..d5e31a7 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -9,6 +9,7 @@ CELT_MINOR_VERSION=7 > CELT_MICRO_VERSION=0 > CELT_EXTRA_VERSION> CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION > +LIBCELT_SUFFIX=${CELT_MAJOR_VERSION}${CELT_MINOR_VERSION}${CELT_MICRO_VERSION} > > CELT_LT_CURRENT=0 > CELT_LT_REVISION=0 > @@ -17,6 +18,7 @@ CELT_LT_AGE=0 > AC_SUBST(CELT_LT_CURRENT) > AC_SUBST(CELT_LT_REVISION) > AC_SUBST(CELT_LT_AGE) > +AC_SUBST(LIBCELT_SUFFIX) > > # For automake. > VERSION=$CELT_VERSION > diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am > index 7c574cc..c4f3787 100644 > --- a/libcelt/Makefile.am > +++ b/libcelt/Makefile.am > @@ -11,17 +11,17 @@ TESTS = match-test.sh > > noinst_SCRIPTS = match-test.sh > > -lib_LTLIBRARIES = libcelt.la > +lib_LTLIBRARIES = libcelt at LIBCELT_SUFFIX@.la > > # Sources for compilation in the library > -libcelt_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \ > +libcelt at LIBCELT_SUFFIX@_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \ > entdec.c entenc.c header.c kfft_single.c kiss_fft.c kiss_fftr.c laplace.c mdct.c \ > modes.c pitch.c psy.c quant_bands.c rangedec.c rangeenc.c rate.c \ > vq.c > > #noinst_HEADERS > > -libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@ > +libcelt at LIBCELT_SUFFIX@_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@ > > noinst_HEADERS = _kiss_fft_guts.h arch.h bands.h fixed_c5x.h fixed_c6x.h \ > cwrs.h ecintrin.h entcode.h entdec.h entenc.h fixed_generic.h float_cast.h \ > @@ -31,9 +31,9 @@ noinst_HEADERS = _kiss_fft_guts.h arch.h bands.h fixed_c5x.h fixed_c6x.h \ > > noinst_PROGRAMS = testcelt dump_modes > testcelt_SOURCES = testcelt.c > -testcelt_LDADD = libcelt.la > +testcelt_LDADD = libcelt at LIBCELT_SUFFIX@.la > INCLUDES = > -#libcelt_la_LIBADD = > +#libcelt at LIBCELT_SUFFIX@_la_LIBADD > > dump_modes_SOURCES = dump_modes.c > -dump_modes_LDADD = libcelt.la > +dump_modes_LDADD = libcelt at LIBCELT_SUFFIX@.la > diff --git a/tests/Makefile.am b/tests/Makefile.am > index 61e8f28..05ebd30 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -15,4 +15,4 @@ mdct_test_SOURCES = mdct-test.c > #rotation_test_SOURCES = rotation-test.c > mathops_test_SOURCES = mathops-test.c > tandem_test_SOURCES = tandem-test.c > -tandem_test_LDADD = $(top_builddir)/libcelt/libcelt.la > +tandem_test_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la > diff --git a/tools/Makefile.am b/tools/Makefile.am > index c7678b6..65099ce 100644 > --- a/tools/Makefile.am > +++ b/tools/Makefile.am > @@ -15,7 +15,7 @@ noinst_HEADERS = wav_io.h > bin_PROGRAMS = celtenc celtdec > > celtenc_SOURCES = celtenc.c wav_io.c skeleton.c > -celtenc_LDADD = $(top_builddir)/libcelt/libcelt.la $(OGG_LIBS) > +celtenc_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la $(OGG_LIBS) > > celtdec_SOURCES = celtdec.c wav_io.c > -celtdec_LDADD = $(top_builddir)/libcelt/libcelt.la $(OGG_LIBS) > +celtdec_LDADD = $(top_builddir)/libcelt/libcelt at LIBCELT_SUFFIX@.la $(OGG_LIBS)