summaryrefslogtreecommitdiff
path: root/Makefile.mesh
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2018-12-04 16:59:01 +0100
committerMarcel Holtmann <marcel@holtmann.org>2018-12-04 17:21:08 +0100
commit0093cd61b1e4f199bca45f8c2f8eb2d5a30e847d (patch)
tree7ba152e499d7ca0f1ae2cfbb73983a8ffbb09e7a /Makefile.mesh
parent8eda0a753507903a13af27a69df19cddf9bec23f (diff)
downloadbluez-0093cd61b1e4f199bca45f8c2f8eb2d5a30e847d.tar.gz
build: Add support for internal and external ELL configuration
Diffstat (limited to 'Makefile.mesh')
-rw-r--r--Makefile.mesh21
1 files changed, 6 insertions, 15 deletions
diff --git a/Makefile.mesh b/Makefile.mesh
index 9cc5b5ecf..a9c387e08 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -1,4 +1,5 @@
if MESH
+
mesh_sources = mesh/mesh.h mesh/mesh.c \
mesh/net_keys.h mesh/net_keys.c \
mesh/mesh-io.h mesh/mesh-io.c \
@@ -21,26 +22,16 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
mesh/mesh-defs.h
libexec_PROGRAMS += mesh/meshd
-mesh_meshd_CPPFLAGS = $(AM_CPPFLAGS) $(ELL_CFLAGS)
-
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_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
+mesh_meshd_DEPENDENCIES = $(ell_dependencies)
noinst_PROGRAMS += mesh/btmesh
-mesh_btmesh_SOURCES = $(mesh_sources) \
- mesh/agent.h \
+mesh_btmesh_SOURCES = $(mesh_sources) mesh/agent.h \
mesh/agent.c \
mesh/btmesh.c
-
-mesh_btmesh_CPPFLAGS = $(AM_CPPFLAGS) $(ELL_CFLAGS)
-
-mesh_btmesh_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 \
- src/libshared-mainloop.la \
- -lreadline $(ELL_LIBS) -ljson-c
+mesh_btmesh_LDADD = src/libshared-mainloop.la $(ell_ldadd) -lreadline -ljson-c
+mesh_btmesh_DEPENDENCIES = $(ell_dependencies)
endif