commit 7e78064871085635c8e54409a59697a278788579
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Nov 24 15:51:34 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Sat Dec 08 16:03:34 2018 -0500
tree 54ae297fc199f8cd21ba0e0e4aa111d4e7865701
parent cf8a3684c21910164c80173e676f3c42271ade69

Change #include style

Header files are now always included with their path from the
project's root directory rather than the path relative to
the includer.

Change-Id: If39b8510eef8da00baf5fe88337c45dbdf8c766e
Refs: #3084

tools/ndnsec/list.cpp

diff --git a/tools/ndnsec/list.cpp b/tools/ndnsec/list.cpp
index 336a574..ec38f6e 100644
--- a/tools/ndnsec/list.cpp
+++ b/tools/ndnsec/list.cpp
@@ -22,7 +22,7 @@
 #include "ndnsec.hpp"
 #include "util.hpp"
 
-#include <ndn-cxx/util/indented-stream.hpp>
+#include "ndn-cxx/util/indented-stream.hpp"
 
 namespace ndn {
 namespace ndnsec {

tools/ndnsec/main.cpp

diff --git a/tools/ndnsec/main.cpp b/tools/ndnsec/main.cpp
index 0db6d54..d2bc281 100644
--- a/tools/ndnsec/main.cpp
+++ b/tools/ndnsec/main.cpp
@@ -22,8 +22,8 @@
 #include "ndnsec.hpp"
 #include "util.hpp"
 
-#include <ndn-cxx/util/logger.hpp>
-#include <ndn-cxx/version.hpp>
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/version.hpp"
 
 #include <boost/exception/get_error_info.hpp>
 

tools/ndnsec/util.cpp

diff --git a/tools/ndnsec/util.cpp b/tools/ndnsec/util.cpp
index b97e934..f5069e7 100644
--- a/tools/ndnsec/util.cpp
+++ b/tools/ndnsec/util.cpp
@@ -21,7 +21,7 @@
 
 #include "util.hpp"
 
-#include <ndn-cxx/security/detail/openssl.hpp>
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 namespace ndn {
 namespace ndnsec {

tools/ndnsec/util.hpp

diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index 65b88e7..8ea6976 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_TOOLS_NDNSEC_UTIL_HPP
 #define NDN_TOOLS_NDNSEC_UTIL_HPP
 
-#include <ndn-cxx/encoding/buffer-stream.hpp>
-#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/security/transform.hpp>
-#include <ndn-cxx/security/v2/additional-description.hpp>
-#include <ndn-cxx/util/io.hpp>
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/key-chain.hpp"
+#include "ndn-cxx/security/transform.hpp"
+#include "ndn-cxx/security/v2/additional-description.hpp"
+#include "ndn-cxx/util/io.hpp"
 
 #include <fstream>
 #include <iostream>

tools/wscript

diff --git a/tools/wscript b/tools/wscript
index 57066f0..29b8536 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -33,19 +33,16 @@
             srcObjects = 'tool-%s-objects' % name
             bld.objects(target=srcObjects,
                         source=srcFiles,
-                        use='ndn-cxx',
-                        includes=name)
+                        use='ndn-cxx')
             testableObjects.append(srcObjects)
 
         bld.program(name='tool-%s' % name,
                     target='../bin/%s' % name,
                     source=[mainFile],
-                    use='ndn-cxx ' + srcObjects,
-                    includes=name)
+                    use='ndn-cxx ' + srcObjects)
 
     bld.objects(target='tools-objects',
                 source=[],
-                export_includes='.',
                 use=testableObjects)
 
     # Tool wrappers