summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-03-12 21:31:36 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-03-12 21:31:36 +0000
commit45e65bdb0940fc3a815e75c58842ed0e56dd4dab (patch)
tree355cb733ce026ab3d52ff4a8c9cbd9d132304cfa /daemon
parent201a729d46df51732304d47b7ed6c0bbe891e7d4 (diff)
Remove configure option for echo service
Diffstat (limited to 'daemon')
-rw-r--r--daemon/Makefile.am15
1 files changed, 2 insertions, 13 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 39eabc7b..214b2449 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,21 +1,12 @@
-if ECHOSERVICE
-if CONFIGFILES
-confdir = $(sysconfdir)/bluetooth
-
-conf_DATA = echo.service
-endif
-
-servicedir = $(libdir)/bluetooth
-
-service_PROGRAMS = bluetoothd-service-echo
+noinst_PROGRAMS = bluetoothd passkey-agent auth-agent \
+ bluetoothd-service-echo
bluetoothd_service_echo_SOURCES = echo.c
bluetoothd_service_echo_LDADD = \
$(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-endif
if CONFIGFILES
dbusdir = $(sysconfdir)/dbus-1/system.d
@@ -23,8 +14,6 @@ dbusdir = $(sysconfdir)/dbus-1/system.d
dbus_DATA = bluetooth.conf
endif
-noinst_PROGRAMS = bluetoothd passkey-agent auth-agent
-
bluetoothd_SOURCES = main.c system.h \
manager.h manager.c database.h database.c \
adapter.h adapter.c service.h service.c