From 14c7f21292b1a5dca3ec3f1745be5badf815c043 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 24 Jan 2024 16:20:07 +0000 Subject: [PATCH] build: remove .service files from DEPENDENCIES lists 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.47.3