Skip to content

Commit

Permalink
build: remove .service files from DEPENDENCIES lists
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
evelikov-work authored and Vudentz committed Jan 25, 2024
1 parent 215e6c7 commit 14c7f21
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Makefile.am
Expand Up @@ -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)"\" \
Expand Down
3 changes: 1 addition & 2 deletions Makefile.mesh
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Makefile.tools
Expand Up @@ -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
Expand Down

0 comments on commit 14c7f21

Please sign in to comment.