diff options
| author | Brian Gix <brian.gix@intel.com> | 2018-12-14 13:46:45 -0800 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2019-01-08 07:50:35 -0800 |
| commit | e3512c74016071aa15ef8984ca3ebc606053e645 (patch) | |
| tree | fc8db4cd4aa7752565403b4b114dca41d9f1cd12 /Makefile.mesh | |
| parent | 52b16066c1abda54ecad51e25d60f58ec97ef4d6 (diff) | |
| download | bluez-e3512c74016071aa15ef8984ca3ebc606053e645.tar.gz | |
mesh: Structural changes for mesh
Delete composition.json since it not used for initialization anymore.
Delete btmesh.c as it is not used anymore.
Delete display.c and display.h, move retained functionality to util.c
Delete prov.c, move retained PB-ADV functionality to pb-adv.c
Delete provision.c, split retained functionality between
prov-acceptor.c and prov-initiator.c
Diffstat (limited to 'Makefile.mesh')
| -rw-r--r-- | Makefile.mesh | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Makefile.mesh b/Makefile.mesh index 8b5af4cf6..ea6c5e939 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -3,35 +3,28 @@ 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 \ - mesh/mesh-io-api.h \ + mesh/error.h mesh/mesh-io-api.h \ mesh/mesh-io-generic.h \ mesh/mesh-io-generic.c \ mesh/storage.h mesh/storage.c \ mesh/net.h mesh/net.c \ - mesh/display.h mesh/display.c \ mesh/crypto.h mesh/crypto.c \ mesh/friend.h mesh/friend.c \ mesh/appkey.h mesh/appkey.c \ mesh/node.h mesh/node.c \ - mesh/prov.h mesh/prov.c \ - mesh/provision.h mesh/provision.c \ + mesh/provision.h mesh/prov.h \ mesh/model.h mesh/model.c \ mesh/cfgmod.h mesh/cfgmod-server.c \ mesh/mesh-db.h mesh/mesh-db.c \ mesh/util.h mesh/util.c \ + mesh/dbus.h mesh/dbus.c \ + mesh/agent.h mesh/agent.c \ + mesh/prov-acceptor.c mesh/prov-initiator.c \ + mesh/pb-adv.h mesh/pb-adv.c \ mesh/mesh-defs.h libexec_PROGRAMS += mesh/meshd mesh_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c mesh_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la - -noinst_PROGRAMS += mesh/btmesh - -mesh_btmesh_SOURCES = $(mesh_sources) mesh/agent.h \ - mesh/agent.c \ - mesh/btmesh.c -mesh_btmesh_LDADD = src/libshared-mainloop.la $(ell_ldadd) -lreadline -ljson-c -mesh_btmesh_DEPENDENCIES = $(ell_dependencies) - endif |