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(+) diff --git a/Makefile.mesh b/Makefile.mesh index 85b88eba4..b1f14e477 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -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 \ diff --git a/Makefile.tools b/Makefile.tools index 7d5361bcd..b6b99d216 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -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 -- 2.14.5
