Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A2D4C43613 for ; Sat, 15 Dec 2018 00:26:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 583E3206C0 for ; Sat, 15 Dec 2018 00:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730083AbeLOA0j (ORCPT ); Fri, 14 Dec 2018 19:26:39 -0500 Received: from mga17.intel.com ([192.55.52.151]:22249 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730056AbeLOA0i (ORCPT ); Fri, 14 Dec 2018 19:26:38 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Dec 2018 16:26:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,355,1539673200"; d="scan'208";a="109640372" Received: from bgix-dell-lap.sea.intel.com ([10.251.138.67]) by fmsmga008.fm.intel.com with ESMTP; 14 Dec 2018 16:26:35 -0800 From: Brian Gix 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 v3 26/30] mesh: Add structural changes for mesh Date: Fri, 14 Dec 2018 16:26:20 -0800 Message-Id: <20181215002624.9313-27-brian.gix@intel.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181215002624.9313-1-brian.gix@intel.com> References: <20181215002624.9313-1-brian.gix@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Inga Stotland --- 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