diff options
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | audio/Makefile.am | 21 | ||||
| -rw-r--r-- | audio/audio.service | 4 | ||||
| -rw-r--r-- | audio/headset.service | 4 | ||||
| -rwxr-xr-x | bootstrap-configure | 2 |
5 files changed, 18 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 754cb531..88696bc8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -158,9 +158,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [ glib_enable=no obex_enable=${openobex_found} alsa_enable=${alsa_found} - headset_enable=no network_enable=no input_enable=no + audio_enable=no sync_enable=no echo_enable=no hcid_enable=yes @@ -236,10 +236,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ alsa_enable=${enableval} ]) - AC_ARG_ENABLE(headset, AC_HELP_STRING([--enable-headset], [enable headset service]), [ - headset_enable=${enableval} - ]) - AC_ARG_ENABLE(network, AC_HELP_STRING([--enable-network], [enable network service]), [ network_enable=${enableval} ]) @@ -248,6 +244,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ input_enable=${enableval} ]) + AC_ARG_ENABLE(audio, AC_HELP_STRING([--enable-audio], [enable audio service]), [ + audio_enable=${enableval} + ]) + AC_ARG_ENABLE(sync, AC_HELP_STRING([--enable-sync], [enable synchronization service]), [ sync_enable=${enableval} ]) @@ -348,9 +348,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") - AM_CONDITIONAL(HEADSETSERVICE, test "${headset_enable}" = "yes") AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes") AM_CONDITIONAL(INPUTSERVICE, test "${input_enable}" = "yes") + AM_CONDITIONAL(AUDIOSERVICE, test "${audio_enable}" = "yes") AM_CONDITIONAL(SYNCSERVICE, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") AM_CONDITIONAL(ECHOSERVICE, test "${echo_enable}" = "yes") AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes") diff --git a/audio/Makefile.am b/audio/Makefile.am index 16c4f245..cbb27956 100644 --- a/audio/Makefile.am +++ b/audio/Makefile.am @@ -1,19 +1,19 @@ -if HEADSETSERVICE +if AUDIOSERVICE if CONFIGFILES confdir = $(sysconfdir)/bluetooth -conf_DATA = headset.service +conf_DATA = audio.service endif servicedir = $(libdir)/bluetooth -service_PROGRAMS = bluetoothd-service-headset +service_PROGRAMS = bluetoothd-service-audio -bluetoothd_service_headset_SOURCES = headset.c +bluetoothd_service_audio_SOURCES = manager.h manager.c headset.c -bluetoothd_service_headset_LDADD = $(top_builddir)/common/libhelper.a \ - @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ +bluetoothd_service_audio_LDADD = $(top_builddir)/common/libhelper.a \ + @SBC_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif if ALSA @@ -30,17 +30,10 @@ libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version -export-dynam libasound_module_ctl_bluetooth_la_LIBADD = @ALSA_LIBS@ endif -noinst_PROGRAMS = bluetoothd-service-audio - -bluetoothd_service_audio_SOURCES = main.c manager.h manager.c - -bluetoothd_service_audio_LDADD = $(top_builddir)/common/libhelper.a \ - @SBC_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ - AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @ALSA_CFLAGS@ @SBC_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -EXTRA_DIST = headset.service audio-api.txt asound.conf +EXTRA_DIST = audio.service audio-api.txt asound.conf MAINTAINERCLEANFILES = Makefile.in diff --git a/audio/audio.service b/audio/audio.service new file mode 100644 index 00000000..3db5aa32 --- /dev/null +++ b/audio/audio.service @@ -0,0 +1,4 @@ +[Bluetooth Service] +Identifier=audio +Name=Audio service +Description=Bluetooth Audio service diff --git a/audio/headset.service b/audio/headset.service deleted file mode 100644 index b2f043ee..00000000 --- a/audio/headset.service +++ /dev/null @@ -1,4 +0,0 @@ -[Bluetooth Service] -Identifier=headset -Name=Headset service -Description=Bluetooth Headset and Handsfree service diff --git a/bootstrap-configure b/bootstrap-configure index e6fa883c..c2188408 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -14,9 +14,9 @@ fi --libexecdir=/lib \ --enable-all \ --enable-glib \ - --enable-headset \ --enable-network \ --enable-input \ + --enable-audio \ --enable-echo \ --disable-configfiles \ --disable-initscripts \ |