From: Inga Stotland <inga.stotland@xxxxxxxxx> --- Makefile.mesh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Makefile.mesh b/Makefile.mesh index a9c387e08..5344fbb21 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -3,22 +3,24 @@ 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 @@ -26,12 +28,18 @@ mesh_meshd_SOURCES = $(mesh_sources) mesh/main.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/agent.c \ - mesh/btmesh.c mesh_btmesh_LDADD = src/libshared-mainloop.la $(ell_ldadd) -lreadline -ljson-c mesh_btmesh_DEPENDENCIES = $(ell_dependencies) +# +# noinst_PROGRAMS += mesh/btmesh +# +# mesh_btmesh_SOURCES = $(mesh_sources) \ +# mesh/btmesh.c +# +#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 + endif -- 2.14.5
