From: Brian Gix <brian.gix@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: johan.hedberg@gmail.com, inga.stotland@intel.com,
marcel@holtmann.org, brian.gix@intel.com
Subject: [PATCH BlueZ v2 26/30] mesh: Add structural changes to for mesh
Date: Fri, 14 Dec 2018 16:01:24 -0800 [thread overview]
Message-ID: <20181215000128.928-27-brian.gix@intel.com> (raw)
In-Reply-To: <20181215000128.928-1-brian.gix@intel.com>
From: Inga Stotland <inga.stotland@intel.com>
---
Makefile.mesh | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/Makefile.mesh b/Makefile.mesh
index a9c387e08..65310860f 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -3,35 +3,42 @@ 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/mesh-defs.h
+ mesh/dbus.h mesh/dbus.c \
+ mesh/agent.h mesh/agent.c \
+ mesh/prov-acceptor.c mesh/prov-initiator.c \
+ 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)
-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
next prev parent reply other threads:[~2018-12-15 0:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-15 0:00 [PATCH BlueZ v2 00/30] Major rewrite for Multi-Node and DBus Brian Gix
2018-12-15 0:00 ` [PATCH BlueZ v2 01/30] mesh: Staging for Mesh DBus API rewrite Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 02/30] mesh: Delete obsolete files Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 03/30] mesh: Utilities for DBus support Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 04/30] mesh: Internal errors Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 05/30] mesh: Re-write storage for Multiple Nodes Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 06/30] mesh: Rewrite Node handling for multiple nodes Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 07/30] mesh: Rewite Network layer " Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 08/30] mesh: Direction agnostic PB-Adv implimentation Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 09/30] mesh: Acceptor side provisioning implimentation Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 10/30] mesh: Initiator " Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 11/30] mesh: Rewrite Controler interface for full init Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 12/30] mesh: Unchanged variables set to const Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 13/30] mesh: centralize generic utilities Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 14/30] mesh: re-arrange provisioning for DBus API Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 15/30] mesh: Re-architect " Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 16/30] mesh: Make config model handle multiple nodes Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 17/30] mesh: Multi node Config Server model Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 18/30] mesh: restructure I/O for multiple nodes Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 19/30] mesh: Restrusture DB to support " Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 21/30] mesh: DBUS interface for Provisioning Agent Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 22/30] mesh: restructure App Key storage Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 23/30] mesh: Clean-up Comment style Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 24/30] mesh: Update for DBus API and multi-node support Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 25/30] mesh: Add default location for Mesh Node storage Brian Gix
2018-12-15 0:01 ` Brian Gix [this message]
2018-12-15 0:01 ` [PATCH BlueZ v2 27/30] mesh: Sample Provisioning Agent Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 28/30] mesh: Sample On/Off Client and Server Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 29/30] mesh: Sample Mesh Joiner (provision acceptor) Brian Gix
2018-12-15 0:01 ` [PATCH BlueZ v2 30/30] mesh: Enable building Mesh Daemon Brian Gix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181215000128.928-27-brian.gix@intel.com \
--to=brian.gix@intel.com \
--cc=inga.stotland@intel.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).