Skip to contentSkip to conversation

build: Add missing mesh & btpclient dependancies

PATCH New Brian Gix 1 participant 1 message Jun 10, 2019

Subsystems (2)
lore
Share & tools
lore

Brian Gix

author
#0 lore raw

PATCH 1/1 build: Add missing mesh & btpclient dependancies

btpclient and bluetooth mesh fail to build on their own until certain ELL and generated header files have been built, which can cause a build to fail if derived objects are generated in wrong order.

---
 Makefile.mesh  | 3 +++
 Makefile.tools | 1 +
 2 files changed, 4 insertions(+)
Makefile.mesh +3 -0
index 85b88eba4..b1f14e477 100644
@@ -35,6 +35,9 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
 				mesh/mesh-defs.h
 pkglibexec_PROGRAMS += mesh/bluetooth-meshd
 
+mesh/mesh.$(OBJEXT): ell/internal
+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 \
Makefile.tools +1 -0
index 7d5361bcd..b6b99d216 100644
@@ -472,4 +472,5 @@ tools_btpclient_SOURCES = tools/btpclient.c src/shared/btp.c src/shared/btp.h
 tools_btpclient_LDADD = lib/libbluetooth-internal.la \
 				src/libshared-ell.la $(ell_ldadd)
 tools_btpclient_DEPENDENCIES = lib/libbluetooth-internal.la $(ell_dependencies)
+tools/btpclient.$(OBJEXT): src/libshared-ell.la ell/internal
 endif
Signature · 1 line
2.14.5