Attachment #4921 for bug #25563

View | Details | Raw Unified | Return to bug 25563
Collapse All | Expand All




CLEANFILES += $(rules_DATA)

EXTRA_DIST += scripts/bluetooth.rules \
		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
		scripts/bluetooth.service.in scripts/org.bluez.service

if PCMCIA
udevdir = $(libexecdir)/udev

dist_udev_SCRIPTS = scripts/bluetooth_serial
endif

if HAVE_SYSTEMD
systemdsystemunit_DATA = \
       scripts/bluetooth.service

scripts/bluetooth.service: scripts/bluetooth.service.in
	@$(SED) -e "s|\@sbindir\@|$(sbindir)|" $< >$@

dbussystemservicesdir = $(datadir)/dbus-1/system-services

dbussystemservices_DATA = \
	scripts/org.bluez.service

endif

EXTRA_DIST += doc/manager-api.txt \
		doc/adapter-api.txt doc/device-api.txt \
		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \


pkgconfig_DATA = bluez.pc

DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir=

DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service

MAINTAINERCLEANFILES = Makefile.in \
	aclocal.m4 configure config.h.in config.sub config.guess \

Lines 56-60 if (test "${enable_capng}" = "yes"); then Link Here

(-)a/configure.ac (+9 lines)
56	AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])	56	AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
57	fi	57	fi
58		58
		59	# systemd
		60
		61	AC_ARG_WITH([systemdsystemunitdir],
		62	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
		63	[],
		64	[with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
		65	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
		66	AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
		67
59	AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml	68	AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
60	src/bluetoothd.8 bluez.pc)	69	src/bluetoothd.8 bluez.pc)

Line 0 Link Here

(-)a/scripts/.gitignore (+1 lines)
	1	bluetooth.service




[Unit]
Description=Bluetooth Manager
After=syslog.target

[Service]
Type=dbus
BusName=org.bluez
ExecStart=@sbindir@/bluetoothd -n
StandardOutput=syslog

[Install]
WantedBy=bluetooth.target
Alias=dbus-org.bluez.service

Line 0 Link Here

(-)a/scripts/org.bluez.service (-1 / +5 lines)
0	-	1	[D-BUS Service]
		2	Name=org.bluez
		3	Exec=/bin/false
		4	User=root
		5	SystemdService=dbus-org.bluez.service

Return to bug 25563

Lines 352-358 endif Link Here

(-)a/Makefile.am (-3 / +18 lines)
352	CLEANFILES += $(rules_DATA)	352	CLEANFILES += $(rules_DATA)
353		353
354	EXTRA_DIST += scripts/bluetooth.rules \	354	EXTRA_DIST += scripts/bluetooth.rules \
355	scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules	355	scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
		356	scripts/bluetooth.service.in scripts/org.bluez.service
356		357
357	if PCMCIA	358	if PCMCIA
358	udevdir = $(libexecdir)/udev	359	udevdir = $(libexecdir)/udev
Lines 360-365 udevdir = $(libexecdir)/udev Link Here
360	dist_udev_SCRIPTS = scripts/bluetooth_serial	361	dist_udev_SCRIPTS = scripts/bluetooth_serial
361	endif	362	endif
362		363
		364	if HAVE_SYSTEMD
		365	systemdsystemunit_DATA = \
		366	scripts/bluetooth.service
		367
		368	scripts/bluetooth.service: scripts/bluetooth.service.in
		369	@$(SED) -e "s\|\@sbindir\@\|$(sbindir)\|" $< >$@
		370
		371	dbussystemservicesdir = $(datadir)/dbus-1/system-services
		372
		373	dbussystemservices_DATA = \
		374	scripts/org.bluez.service
		375
		376	endif
		377
363	EXTRA_DIST += doc/manager-api.txt \	378	EXTRA_DIST += doc/manager-api.txt \
364	doc/adapter-api.txt doc/device-api.txt \	379	doc/adapter-api.txt doc/device-api.txt \
365	doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \	380	doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
Lines 385-393 pkgconfigdir = $(libdir)/pkgconfig Link Here
385		400
386	pkgconfig_DATA = bluez.pc	401	pkgconfig_DATA = bluez.pc
387		402
388	DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib	403	DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir=
389		404
390	DISTCLEANFILES = $(pkgconfig_DATA)	405	DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service
391		406
392	MAINTAINERCLEANFILES = Makefile.in \	407	MAINTAINERCLEANFILES = Makefile.in \
393	aclocal.m4 configure config.h.in config.sub config.guess \	408	aclocal.m4 configure config.h.in config.sub config.guess \

Line 0 Link Here

(-)a/scripts/bluetooth.service.in (+13 lines)
	1	[Unit]
	2	Description=Bluetooth Manager
	3	After=syslog.target
	4
	5	[Service]
	6	Type=dbus
	7	BusName=org.bluez
	8	ExecStart=@sbindir@/bluetoothd -n
	9	StandardOutput=syslog
	10
	11	[Install]
	12	WantedBy=bluetooth.target
	13	Alias=dbus-org.bluez.service