ref: df726557ad6cc7cdea40d5f6b4db89d2c651e157
parent: 7f1822961de6af9a974cd07cab4de6b86a60b574
author: Thorvald Natvig <[email protected]>
date: Sat Jan 16 03:06:41 EST 2010
Change name of libcelt to libcelt0
--- a/celt.pc.in
+++ b/celt.pc.in
@@ -10,5 +10,5 @@
Version: @CELT_VERSION@
Requires:
Conflicts:
-Libs: -L${libdir} -lcelt -lm+Libs: -L${libdir} -lcelt@LIBCELT_SUFFIX@ -lm Cflags: -I${includedir}--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@
CELT_MICRO_VERSION=0
CELT_EXTRA_VERSION=
CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
+LIBCELT_SUFFIX=0
CELT_LT_CURRENT=0
CELT_LT_REVISION=0
@@ -17,6 +18,7 @@
AC_SUBST(CELT_LT_CURRENT)
AC_SUBST(CELT_LT_REVISION)
AC_SUBST(CELT_LT_AGE)
+AC_SUBST(LIBCELT_SUFFIX)
# For automake.
VERSION=$CELT_VERSION
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -11,15 +11,15 @@
noinst_SCRIPTS = match-test.sh
-lib_LTLIBRARIES = libcelt.la
+lib_LTLIBRARIES = libcelt@[email protected]
# Sources for compilation in the library
-libcelt_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \
+libcelt@LIBCELT_SUFFIX@_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \
entdec.c entenc.c header.c kiss_fft.c laplace.c mdct.c \
modes.c pitch.c quant_bands.c rangedec.c rangeenc.c rate.c \
vq.c
-libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
+libcelt@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 \
@@ -29,9 +29,9 @@
noinst_PROGRAMS = testcelt dump_modes
testcelt_SOURCES = testcelt.c
-testcelt_LDADD = libcelt.la
+testcelt_LDADD = libcelt@[email protected]
INCLUDES =
-#libcelt_la_LIBADD =
+#libcelt@LIBCELT_SUFFIX@_la_LIBADD =
dump_modes_SOURCES = dump_modes.c
-dump_modes_LDADD = libcelt.la
+dump_modes_LDADD = libcelt@[email protected]
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,4 +15,4 @@
#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@[email protected]
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@
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@[email protected] $(OGG_LIBS)
celtdec_SOURCES = celtdec.c wav_io.c
-celtdec_LDADD = $(top_builddir)/libcelt/libcelt.la $(OGG_LIBS)
+celtdec_LDADD = $(top_builddir)/libcelt/libcelt@[email protected] $(OGG_LIBS)