summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-20 02:36:57 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-20 02:36:57 +0000
commit884cfe825db1a0e8c98aa6a604fd4588a1de1340 (patch)
tree94299de2aa4dd1b9491dad38ddca732bc48b1991
parent8b0cafdd2ca283cb2082f812c94c33782aef7836 (diff)
Don't install services that are in experimental state
-rw-r--r--audio/Makefile.am5
-rw-r--r--daemon/Makefile.am8
-rw-r--r--input/Makefile.am2
-rw-r--r--network/Makefile.am2
-rw-r--r--transfer/Makefile.am2
5 files changed, 13 insertions, 6 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am
index b6d39c61..60a546e7 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -9,9 +9,8 @@ glib_cflags =
glib_ldadd =
endif
-service_PROGRAMS = bluetoothd-service-audio
-
-noinst_PROGRAMS = bluetoothd-service-headset
+noinst_PROGRAMS = bluetoothd-service-audio \
+ bluetoothd-service-headset
bluetoothd_service_audio_SOURCES = main.c
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7bf8d440..336f2a25 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,4 +1,10 @@
+if CONFIGFILES
+confdir = $(sysconfdir)/bluetooth
+
+conf_DATA = echo.service
+endif
+
servicedir = $(libdir)/bluetooth
if GLIB
@@ -35,4 +41,6 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags)
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd
+EXTRA_DIST = echo.service
+
MAINTAINERCLEANFILES = Makefile.in
diff --git a/input/Makefile.am b/input/Makefile.am
index 71beb94e..e9efa972 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -15,7 +15,7 @@ glib_cflags =
glib_ldadd =
endif
-service_PROGRAMS = bluetoothd-service-input
+noinst_PROGRAMS = bluetoothd-service-input
bluetoothd_service_input_SOURCES = \
main.c input-service.h input-service.c
diff --git a/network/Makefile.am b/network/Makefile.am
index c0c196fc..362c7af6 100644
--- a/network/Makefile.am
+++ b/network/Makefile.am
@@ -1,7 +1,7 @@
servicedir = $(libdir)/bluetooth
-service_PROGRAMS = bluetoothd-service-network
+noinst_PROGRAMS = bluetoothd-service-network
bluetoothd_service_network_SOURCES = main.c
diff --git a/transfer/Makefile.am b/transfer/Makefile.am
index c2480120..97b9cc0d 100644
--- a/transfer/Makefile.am
+++ b/transfer/Makefile.am
@@ -16,7 +16,7 @@ glib_cflags =
glib_ldadd =
endif
-service_PROGRAMS = bluetoothd-service-transfer
+noinst_PROGRAMS = bluetoothd-service-transfer
bluetoothd_service_transfer_SOURCES = \
main.c session.h session.c