build: Add missing mesh & btpclient dependencies
authorBrian Gix <brian.gix@intel.com>
Wed, 12 Jun 2019 15:09:50 +0000 (08:09 -0700)
committerAnupam Roy <anupam.r@samsung.com>
Tue, 17 Dec 2019 15:11:55 +0000 (20:41 +0530)
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.

Change-Id: I4e50d13e8fbd2718cc6a1fc3ee6bef5db0d46e94
Signed-off-by: Anupam Roy <anupam.r@samsung.com>
Makefile.mesh

index 3471155..b05fd70 100644 (file)
@@ -35,11 +35,8 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
                                mesh/mesh-defs.h
 libexec_PROGRAMS += mesh/bluetooth-meshd
 
-mesh_meshd_SOURCES = $(mesh_sources) mesh/main.c
-
-mesh_meshd_LDADD = src/shared/ecc.lo src/shared/queue.lo src/shared/io-ell.lo \
-                               src/shared/util.lo src/shared/hci.lo src/shared/mgmt.lo \
-                               @DBUS_LIBS@ @ELL_LIBS@ -ljson-c
+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