From: Emil Velikov <emil.l.velikov@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH BlueZ v2 2/6] build: remove .service files from DEPENDENCIES lists
Date: Wed, 24 Jan 2024 16:20:07 +0000 [thread overview]
Message-ID: <20240124-autofoo-v2-2-a210f20aa2f7@gmail.com> (raw)
In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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 a470e40cf..be8f74f13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -341,8 +341,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
WARNING: multiple messages have this Message-ID (diff)
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 v2 2/6] build: remove .service files from DEPENDENCIES lists
Date: Wed, 24 Jan 2024 16:20:07 +0000 [thread overview]
Message-ID: <20240124-autofoo-v2-2-a210f20aa2f7@gmail.com> (raw)
In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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 a470e40cf..be8f74f13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -341,8 +341,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-24 16:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 16:20 [PATCH BlueZ v2 0/6] Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-24 16:20 ` [PATCH BlueZ v2 1/6] build: remove unused variable builtin_nodist Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-24 18:33 ` Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service bluez.test.bot
2024-01-24 16:20 ` Emil Velikov [this message]
2024-01-24 16:20 ` [PATCH BlueZ v2 2/6] build: remove .service files from DEPENDENCIES lists Emil Velikov via B4 Relay
2024-01-24 16:20 ` [PATCH BlueZ v2 3/6] build: remove explicit DEPENDENCIES handling Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-24 16:20 ` [PATCH BlueZ v2 4/6] build: manage .service.in files via configure.ac Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-24 16:20 ` [PATCH BlueZ v2 5/6] build: enable gc/dead code removal Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-24 16:20 ` [PATCH BlueZ v2 6/6] build: install dbus-org.bluez.obex.service symlink Emil Velikov
2024-01-24 16:20 ` Emil Velikov via B4 Relay
2024-01-25 19:10 ` [PATCH BlueZ v2 0/6] 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=20240124-autofoo-v2-2-a210f20aa2f7@gmail.com \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.