File libsbc-make-it-installable of Package bluez

Overview Repositories Revisions Requests Users Attributes Meta

File libsbc-make-it-installable of Package bluez

From: Jeff Mahoney <jeffm@suse.com>
Subject: libsbc: Make it installable

While rebuilding Opal, I found that the SBC plugin no longer ships with
 the SBC code. This patch allows other projects to use the SBC code
 without having to duplicate it.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 Makefile.am  |    8 ++++----
 configure.ac |    3 ++-
 libsbc.pc.in |   10 ++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ local_headers = $(foreach file,$(lib_hea
 
 BUILT_SOURCES = $(local_headers) src/builtin.h
 
-include_HEADERS += $(lib_headers)
+include_HEADERS += $(lib_headers) sbc/sbc.h
 
 lib_LTLIBRARIES += lib/libbluetooth.la
 
@@ -78,7 +78,7 @@ noinst_LTLIBRARIES += lib/libbluetooth-p
 lib_libbluetooth_private_la_SOURCES = $(lib_libbluetooth_la_SOURCES)
 
 if SBC
-noinst_LTLIBRARIES += sbc/libsbc.la
+lib_LTLIBRARIES += sbc/libsbc.la
 
 sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \
 			sbc/sbc_primitives.h sbc/sbc_primitives.c \
@@ -90,7 +90,7 @@ sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sb
 sbc_libsbc_la_CFLAGS = $(AM_CFLAGS) -finline-functions -fgcse-after-reload \
 					-funswitch-loops -funroll-loops
 
-noinst_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+bin_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc
 
 sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h
 sbc_sbcdec_LDADD = sbc/libsbc.la
@@ -462,7 +462,7 @@ TESTS = $(unit_tests)
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = bluez.pc
+pkgconfig_DATA = bluez.pc libsbc.pc
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles
 
--- a/configure.ac
+++ b/configure.ac
@@ -72,4 +72,5 @@ fi
 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
 AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
-			src/bluetoothd.8 src/bluetooth.service bluez.pc)
+			src/bluetoothd.8 src/bluetooth.service bluez.pc
+			libsbc.pc)
--- /dev/null
+++ b/libsbc.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: BlueZ libsbc
+Description: Bluetooth low-complexity SubBand Codec
+Version: @VERSION@
+Libs: -L${libdir} -lsbc
+Cflags: -I${includedir}

Places

File libsbc-make-it-installable of Package bluez

Places