From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org>
To: linux-bluetooth@vger.kernel.org
Cc: Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH BlueZ 06/10] build: remove .service files from DEPENDENCIES lists
Date: Tue, 16 Jan 2024 13:52:00 +0000 [thread overview]
Message-ID: <20240116-autofoo-v1-6-626f6b54bd06@gmail.com> (raw)
In-Reply-To: <20240116-autofoo-v1-0-626f6b54bd06@gmail.com>
From: Emil Velikov <emil.velikov@collabora.com>
The DEPENDENCES lists are for binary objects, while the service files
are required by systemd (et al) after the install stage. The services
files are referenced by _DATA, so the service.in -> service conversion
can happen then.
---
Makefile.am | 3 +--
Makefile.mesh | 3 +--
Makefile.tools | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 564f1b935..2be214631 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,8 +335,7 @@ src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
src_bluetoothd_DEPENDENCIES = lib/libbluetooth-internal.la \
gdbus/libgdbus-internal.la \
- src/libshared-glib.la \
- src/bluetooth.service
+ src/libshared-glib.la
src_bluetoothd_CPPFLAGS = $(AM_CPPFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \
-DPLUGINDIR=\""$(build_plugindir)"\" \
diff --git a/Makefile.mesh b/Makefile.mesh
index 63f085de1..a66e47442 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -45,8 +45,7 @@ mesh/main.$(OBJEXT): src/builtin.h lib/bluetooth/bluetooth.h
mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c
mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
-mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la \
- mesh/bluetooth-mesh.service
+mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la
if MANPAGES
man_MANS += mesh/bluetooth-meshd.8
diff --git a/Makefile.tools b/Makefile.tools
index e541084e9..6fda3f51d 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -71,8 +71,7 @@ pkglibexec_PROGRAMS += tools/btmon-logger
tools_btmon_logger_SOURCES = tools/btmon-logger.c
tools_btmon_logger_LDADD = src/libshared-mainloop.la
-tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la \
- tools/bluetooth-logger.service
+tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la
if SYSTEMD
systemdsystemunit_DATA += tools/bluetooth-logger.service
--
2.43.0
next prev parent reply other threads:[~2024-01-16 13:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 13:51 [PATCH BlueZ 00/10] Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service Emil Velikov via B4 Relay
2024-01-16 13:51 ` [PATCH BlueZ 01/10] build: remove unused AM_CONDITIONAL Emil Velikov via B4 Relay
2024-01-16 15:41 ` Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service bluez.test.bot
2024-01-16 13:51 ` [PATCH BlueZ 02/10] build: tweak PKG_CHECK_MODULES calls Emil Velikov via B4 Relay
2024-01-16 13:51 ` [PATCH BlueZ 03/10] build: require libudev 196, circa 2012 Emil Velikov via B4 Relay
2024-01-16 13:51 ` [PATCH BlueZ 04/10] build: remove dummy {conf,state}{dir,_DATA} Emil Velikov via B4 Relay
2024-01-16 18:40 ` Luiz Augusto von Dentz
2024-01-17 8:39 ` Emil Velikov
2024-01-18 16:12 ` Emil Velikov
2024-01-18 17:05 ` Luiz Augusto von Dentz
2024-01-19 11:09 ` Emil Velikov
2024-01-19 15:09 ` Luiz Augusto von Dentz
2024-01-16 13:51 ` [PATCH BlueZ 05/10] build: remove unused variable builtin_nodist Emil Velikov via B4 Relay
2024-01-16 13:52 ` Emil Velikov via B4 Relay [this message]
2024-01-16 13:52 ` [PATCH BlueZ 07/10] build: remove explicit DEPENDENCIES handling Emil Velikov via B4 Relay
2024-01-16 13:52 ` [PATCH BlueZ 08/10] build: manage .service.in files via configure.ac Emil Velikov via B4 Relay
2024-01-16 13:52 ` [PATCH BlueZ 09/10] build: enable gc/dead code removal Emil Velikov via B4 Relay
2024-01-16 13:52 ` [PATCH BlueZ 10/10] build: install dbus-org.bluez.obex.service symlink Emil Velikov via B4 Relay
2024-01-16 19:02 ` [PATCH BlueZ 00/10] Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240116-autofoo-v1-6-626f6b54bd06@gmail.com \
--to=devnull+emil.l.velikov.gmail.com@kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=emil.velikov@collabora.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox