src: Another round of source updates: moving all headers close to implementation files
Change-Id: I3d47076504950e67746174623c75383948e9d93d
diff --git a/examples/consumer.cpp b/examples/consumer.cpp
index 3e57d20..bba9a7f 100644
--- a/examples/consumer.cpp
+++ b/examples/consumer.cpp
@@ -5,7 +5,10 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/face.hpp>
+// correct way to include NDN-CPP headers
+// #include <ndn-cpp-dev/face.hpp>
+#include "face.hpp"
+
#include <stdexcept>
#if NDN_CPP_HAVE_CXX11
diff --git a/examples/producer.cpp b/examples/producer.cpp
index fd25515..4a24bac 100644
--- a/examples/producer.cpp
+++ b/examples/producer.cpp
@@ -5,9 +5,12 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/face.hpp>
+// correct way to include NDN-CPP headers
+// #include <ndn-cpp-dev/face.hpp>
+// #include <ndn-cpp-dev/security/key-chain.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include "face.hpp"
+#include "security/key-chain.hpp"
#if NDN_CPP_HAVE_CXX11
// In the std library, the placeholders are in a different namespace than boost.
diff --git a/src/common.cpp b/src/common.cpp
index 53df6e1..c3dedd2 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -6,7 +6,7 @@
*/
#include <sstream>
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#include "util/time.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/common.hpp b/src/common.hpp
similarity index 96%
rename from include/ndn-cpp-dev/common.hpp
rename to src/common.hpp
index 95772b6..8903f22 100644
--- a/include/ndn-cpp-dev/common.hpp
+++ b/src/common.hpp
@@ -8,7 +8,7 @@
#ifndef NDN_COMMON_HPP
#define NDN_COMMON_HPP
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#include <stdint.h>
// TODO: Is stddef.h portable?
#include <stddef.h>
diff --git a/src/data.cpp b/src/data.cpp
index 19db78f..85d87a5 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -5,8 +5,8 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/common.hpp>
-#include <ndn-cpp-dev/data.hpp>
+#include "common.hpp"
+#include "data.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/data.hpp b/src/data.hpp
similarity index 100%
rename from include/ndn-cpp-dev/data.hpp
rename to src/data.hpp
diff --git a/include/ndn-cpp-dev/encoding/block-helpers.hpp b/src/encoding/block-helpers.hpp
similarity index 100%
rename from include/ndn-cpp-dev/encoding/block-helpers.hpp
rename to src/encoding/block-helpers.hpp
diff --git a/src/encoding/block.cpp b/src/encoding/block.cpp
index 4b41ebc..f881c8e 100644
--- a/src/encoding/block.cpp
+++ b/src/encoding/block.cpp
@@ -7,8 +7,8 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
-#include <ndn-cpp-dev/encoding/block.hpp>
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include "encoding/block.hpp"
+#include "encoding/tlv.hpp"
namespace ndn {
diff --git a/include/ndn-cpp-dev/encoding/block.hpp b/src/encoding/block.hpp
similarity index 99%
rename from include/ndn-cpp-dev/encoding/block.hpp
rename to src/encoding/block.hpp
index de8c5a5..3ae5971 100644
--- a/include/ndn-cpp-dev/encoding/block.hpp
+++ b/src/encoding/block.hpp
@@ -10,7 +10,7 @@
#ifndef NDN_BLOCK_HPP
#define NDN_BLOCK_HPP
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#include <list>
#include <exception>
diff --git a/include/ndn-cpp-dev/encoding/buffer.hpp b/src/encoding/buffer.hpp
similarity index 98%
rename from include/ndn-cpp-dev/encoding/buffer.hpp
rename to src/encoding/buffer.hpp
index 368b445..f6b7a17 100644
--- a/include/ndn-cpp-dev/encoding/buffer.hpp
+++ b/src/encoding/buffer.hpp
@@ -10,7 +10,7 @@
#ifndef NDN_BUFFER_HPP
#define NDN_BUFFER_HPP
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#include <boost/iostreams/detail/ios.hpp>
#include <boost/iostreams/categories.hpp>
diff --git a/src/encoding/cryptopp/asn_ext.cpp b/src/encoding/cryptopp/asn_ext.cpp
index 4df06c5..9a3816e 100644
--- a/src/encoding/cryptopp/asn_ext.cpp
+++ b/src/encoding/cryptopp/asn_ext.cpp
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#include "asn_ext.hpp"
#include "../../util/time.hpp"
diff --git a/src/encoding/cryptopp/asn_ext.hpp b/src/encoding/cryptopp/asn_ext.hpp
index f0ed463..c53cb96 100644
--- a/src/encoding/cryptopp/asn_ext.hpp
+++ b/src/encoding/cryptopp/asn_ext.hpp
@@ -23,7 +23,7 @@
#endif
#include <stdexcept>
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#include <cryptopp/asn.h>
namespace ndn {
diff --git a/include/ndn-cpp-dev/encoding/endian.hpp b/src/encoding/endian.hpp
similarity index 100%
rename from include/ndn-cpp-dev/encoding/endian.hpp
rename to src/encoding/endian.hpp
diff --git a/src/encoding/oid.cpp b/src/encoding/oid.cpp
index 4edbf01..d1504e1 100644
--- a/src/encoding/oid.cpp
+++ b/src/encoding/oid.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sstream>
-#include <ndn-cpp-dev/encoding/oid.hpp>
+#include "encoding/oid.hpp"
#include <cryptopp/asn.h>
using namespace std;
diff --git a/include/ndn-cpp-dev/encoding/oid.hpp b/src/encoding/oid.hpp
similarity index 100%
rename from include/ndn-cpp-dev/encoding/oid.hpp
rename to src/encoding/oid.hpp
diff --git a/include/ndn-cpp-dev/encoding/tlv-face-management.hpp b/src/encoding/tlv-face-management.hpp
similarity index 100%
rename from include/ndn-cpp-dev/encoding/tlv-face-management.hpp
rename to src/encoding/tlv-face-management.hpp
diff --git a/include/ndn-cpp-dev/encoding/tlv.hpp b/src/encoding/tlv.hpp
similarity index 100%
rename from include/ndn-cpp-dev/encoding/tlv.hpp
rename to src/encoding/tlv.hpp
diff --git a/src/exclude.cpp b/src/exclude.cpp
index 8d49040..677548c 100644
--- a/src/exclude.cpp
+++ b/src/exclude.cpp
@@ -8,7 +8,7 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
-#include <ndn-cpp-dev/exclude.hpp>
+#include "exclude.hpp"
namespace ndn
{
diff --git a/include/ndn-cpp-dev/exclude.hpp b/src/exclude.hpp
similarity index 100%
rename from include/ndn-cpp-dev/exclude.hpp
rename to src/exclude.hpp
diff --git a/include/ndn-cpp-dev/face-instance.hpp b/src/face-instance.hpp
similarity index 100%
rename from include/ndn-cpp-dev/face-instance.hpp
rename to src/face-instance.hpp
diff --git a/src/face.cpp b/src/face.cpp
index 45d577b..9385358 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/face.hpp>
+#include "face.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/face.hpp b/src/face.hpp
similarity index 100%
rename from include/ndn-cpp-dev/face.hpp
rename to src/face.hpp
diff --git a/include/ndn-cpp-dev/forwarding-entry.hpp b/src/forwarding-entry.hpp
similarity index 100%
rename from include/ndn-cpp-dev/forwarding-entry.hpp
rename to src/forwarding-entry.hpp
diff --git a/include/ndn-cpp-dev/forwarding-flags.hpp b/src/forwarding-flags.hpp
similarity index 100%
rename from include/ndn-cpp-dev/forwarding-flags.hpp
rename to src/forwarding-flags.hpp
diff --git a/src/interest.cpp b/src/interest.cpp
index bbaf90a..7f2ddc1 100644
--- a/src/interest.cpp
+++ b/src/interest.cpp
@@ -6,8 +6,8 @@
*/
#include <stdexcept>
-#include <ndn-cpp-dev/common.hpp>
-#include <ndn-cpp-dev/interest.hpp>
+#include "common.hpp"
+#include "interest.hpp"
#if __clang__
#pragma clang diagnostic push
diff --git a/include/ndn-cpp-dev/interest.hpp b/src/interest.hpp
similarity index 100%
rename from include/ndn-cpp-dev/interest.hpp
rename to src/interest.hpp
diff --git a/include/ndn-cpp-dev/key-locator.hpp b/src/key-locator.hpp
similarity index 100%
rename from include/ndn-cpp-dev/key-locator.hpp
rename to src/key-locator.hpp
diff --git a/include/ndn-cpp-dev/meta-info.hpp b/src/meta-info.hpp
similarity index 100%
rename from include/ndn-cpp-dev/meta-info.hpp
rename to src/meta-info.hpp
diff --git a/src/name.cpp b/src/name.cpp
index 484fdc0..2ca9076 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -9,7 +9,7 @@
#include <stdexcept>
#include <algorithm>
#include <cstring>
-#include <ndn-cpp-dev/name.hpp>
+#include "name.hpp"
#include "util/time.hpp"
#include "util/string-helper.hpp"
diff --git a/include/ndn-cpp-dev/name.hpp b/src/name.hpp
similarity index 100%
rename from include/ndn-cpp-dev/name.hpp
rename to src/name.hpp
diff --git a/src/node.cpp b/src/node.cpp
index fb216ca..fb5e086 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -8,14 +8,14 @@
#include <stdexcept>
#include "util/time.hpp"
-#include <ndn-cpp-dev/forwarding-entry.hpp>
-#include <ndn-cpp-dev/face-instance.hpp>
-#include <ndn-cpp-dev/node.hpp>
+#include "forwarding-entry.hpp"
+#include "face-instance.hpp"
+#include "node.hpp"
#include "util/ndnd-id-fetcher.hpp"
-#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
-#include <ndn-cpp-dev/status-response.hpp>
+#include "security/signature-sha256-with-rsa.hpp"
+#include "status-response.hpp"
using namespace std;
#if NDN_CPP_HAVE_CXX11
diff --git a/include/ndn-cpp-dev/node.hpp b/src/node.hpp
similarity index 100%
rename from include/ndn-cpp-dev/node.hpp
rename to src/node.hpp
diff --git a/src/security/certificate-extension.cpp b/src/security/certificate-extension.cpp
index 81d7d34..4864a6b 100644
--- a/src/security/certificate-extension.cpp
+++ b/src/security/certificate-extension.cpp
@@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-#include <ndn-cpp-dev/security/certificate-extension.hpp>
+#include "security/certificate-extension.hpp"
#include <cryptopp/asn.h>
using namespace std;
diff --git a/include/ndn-cpp-dev/security/certificate-extension.hpp b/src/security/certificate-extension.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/certificate-extension.hpp
rename to src/security/certificate-extension.hpp
diff --git a/src/security/certificate-subject-description.cpp b/src/security/certificate-subject-description.cpp
index 383e189..73c0c1b 100644
--- a/src/security/certificate-subject-description.cpp
+++ b/src/security/certificate-subject-description.cpp
@@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-#include <ndn-cpp-dev/security/certificate-subject-description.hpp>
+#include "security/certificate-subject-description.hpp"
#include <cryptopp/asn.h>
using namespace std;
diff --git a/include/ndn-cpp-dev/security/certificate-subject-description.hpp b/src/security/certificate-subject-description.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/certificate-subject-description.hpp
rename to src/security/certificate-subject-description.hpp
diff --git a/src/security/certificate.cpp b/src/security/certificate.cpp
index add546c..e94f962 100644
--- a/src/security/certificate.cpp
+++ b/src/security/certificate.cpp
@@ -18,9 +18,9 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
-#include <ndn-cpp-dev/security/certificate.hpp>
+#include "security/certificate.hpp"
#include "../util/logging.hpp"
#include "../util/time.hpp"
diff --git a/include/ndn-cpp-dev/security/certificate.hpp b/src/security/certificate.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/certificate.hpp
rename to src/security/certificate.hpp
diff --git a/include/ndn-cpp-dev/security/encryption-manager.hpp b/src/security/encryption-manager.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/encryption-manager.hpp
rename to src/security/encryption-manager.hpp
diff --git a/src/security/identity-certificate.cpp b/src/security/identity-certificate.cpp
index 5157d2d..334172e 100644
--- a/src/security/identity-certificate.cpp
+++ b/src/security/identity-certificate.cpp
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
+#include "security/identity-certificate.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/security/identity-certificate.hpp b/src/security/identity-certificate.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/identity-certificate.hpp
rename to src/security/identity-certificate.hpp
diff --git a/include/ndn-cpp-dev/security/key-chain.hpp b/src/security/key-chain.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/key-chain.hpp
rename to src/security/key-chain.hpp
diff --git a/src/security/public-key.cpp b/src/security/public-key.cpp
index 53019ff..c1cb84d 100644
--- a/src/security/public-key.cpp
+++ b/src/security/public-key.cpp
@@ -18,8 +18,8 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-#include <ndn-cpp-dev/common.hpp>
-#include <ndn-cpp-dev/security/public-key.hpp>
+#include "common.hpp"
+#include "security/public-key.hpp"
#include <cryptopp/rsa.h>
#include <cryptopp/base64.h>
diff --git a/include/ndn-cpp-dev/security/public-key.hpp b/src/security/public-key.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/public-key.hpp
rename to src/security/public-key.hpp
diff --git a/src/security/sec-policy-no-verify.cpp b/src/security/sec-policy-no-verify.cpp
index 640cf86..23ffa42 100644
--- a/src/security/sec-policy-no-verify.cpp
+++ b/src/security/sec-policy-no-verify.cpp
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/security/sec-policy-no-verify.hpp>
+#include "security/sec-policy-no-verify.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/security/sec-policy-no-verify.hpp b/src/security/sec-policy-no-verify.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
rename to src/security/sec-policy-no-verify.hpp
diff --git a/src/security/sec-policy-self-verify.cpp b/src/security/sec-policy-self-verify.cpp
index 3df26ce..ca9fb3d 100644
--- a/src/security/sec-policy-self-verify.cpp
+++ b/src/security/sec-policy-self-verify.cpp
@@ -9,8 +9,8 @@
#ifdef TEMPRORARILY_DISABLED
#include "../c/util/crypto.h"
-#include <ndn-cpp-dev/security/identity-storage.hpp>
-#include <ndn-cpp-dev/security/sec-policy-self-verify.hpp>
+#include "security/identity-storage.hpp"
+#include "security/sec-policy-self-verify.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/security/sec-policy-self-verify.hpp b/src/security/sec-policy-self-verify.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
rename to src/security/sec-policy-self-verify.hpp
diff --git a/include/ndn-cpp-dev/security/sec-policy.hpp b/src/security/sec-policy.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-policy.hpp
rename to src/security/sec-policy.hpp
diff --git a/src/security/sec-public-info-memory.cpp b/src/security/sec-public-info-memory.cpp
index a46e872..2fc7418 100644
--- a/src/security/sec-public-info-memory.cpp
+++ b/src/security/sec-public-info-memory.cpp
@@ -5,10 +5,10 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/security/sec-public-info-memory.hpp>
+#include "security/sec-public-info-memory.hpp"
#include <algorithm>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
+#include "security/identity-certificate.hpp"
using namespace std;
diff --git a/include/ndn-cpp-dev/security/sec-public-info-memory.hpp b/src/security/sec-public-info-memory.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-public-info-memory.hpp
rename to src/security/sec-public-info-memory.hpp
diff --git a/src/security/sec-public-info-sqlite3.cpp b/src/security/sec-public-info-sqlite3.cpp
index 2072091..4098b4a 100644
--- a/src/security/sec-public-info-sqlite3.cpp
+++ b/src/security/sec-public-info-sqlite3.cpp
@@ -7,7 +7,7 @@
*/
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#ifdef NDN_CPP_HAVE_SQLITE3
#include <sqlite3.h>
@@ -19,10 +19,10 @@
#include "../util/logging.hpp"
#include "../util/time.hpp"
-#include <ndn-cpp-dev/data.hpp>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
-#include <ndn-cpp-dev/security/sec-public-info-sqlite3.hpp>
-#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
+#include "data.hpp"
+#include "security/identity-certificate.hpp"
+#include "security/sec-public-info-sqlite3.hpp"
+#include "security/signature-sha256-with-rsa.hpp"
INIT_LOGGER("BasicKeyMetaInfo");
diff --git a/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp b/src/security/sec-public-info-sqlite3.hpp
similarity index 98%
rename from include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
rename to src/security/sec-public-info-sqlite3.hpp
index 8468fc2..30f28f8 100644
--- a/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
+++ b/src/security/sec-public-info-sqlite3.hpp
@@ -10,7 +10,7 @@
#define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#ifdef NDN_CPP_HAVE_SQLITE3
#include "../common.hpp"
diff --git a/include/ndn-cpp-dev/security/sec-public-info.hpp b/src/security/sec-public-info.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-public-info.hpp
rename to src/security/sec-public-info.hpp
diff --git a/src/security/sec-tpm-file.cpp b/src/security/sec-tpm-file.cpp
index 3981ec4..56f42f8 100644
--- a/src/security/sec-tpm-file.cpp
+++ b/src/security/sec-tpm-file.cpp
@@ -11,7 +11,7 @@
#pragma clang diagnostic ignored "-Wtautological-compare"
#endif
-#include <ndn-cpp-dev/security/sec-tpm-file.hpp>
+#include "security/sec-tpm-file.hpp"
#include <string>
diff --git a/include/ndn-cpp-dev/security/sec-tpm-file.hpp b/src/security/sec-tpm-file.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-tpm-file.hpp
rename to src/security/sec-tpm-file.hpp
diff --git a/src/security/sec-tpm-memory.cpp b/src/security/sec-tpm-memory.cpp
index c9617ba..71b1f62 100644
--- a/src/security/sec-tpm-memory.cpp
+++ b/src/security/sec-tpm-memory.cpp
@@ -5,8 +5,8 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/security/sec-tpm-memory.hpp>
-#include <ndn-cpp-dev/security/public-key.hpp>
+#include "security/sec-tpm-memory.hpp"
+#include "security/public-key.hpp"
#include <openssl/ssl.h>
#include <openssl/sha.h>
#include <openssl/rsa.h>
diff --git a/include/ndn-cpp-dev/security/sec-tpm-memory.hpp b/src/security/sec-tpm-memory.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-tpm-memory.hpp
rename to src/security/sec-tpm-memory.hpp
diff --git a/src/security/sec-tpm-osx.cpp b/src/security/sec-tpm-osx.cpp
index 23a33f0..8d5ab48 100644
--- a/src/security/sec-tpm-osx.cpp
+++ b/src/security/sec-tpm-osx.cpp
@@ -5,15 +5,15 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#include <fstream>
#include <sstream>
#include "../util/logging.hpp"
-#include <ndn-cpp-dev/security/sec-tpm-osx.hpp>
-#include <ndn-cpp-dev/security/public-key.hpp>
+#include "security/sec-tpm-osx.hpp"
+#include "security/public-key.hpp"
#include <CoreFoundation/CoreFoundation.h>
#include <Security/Security.h>
diff --git a/include/ndn-cpp-dev/security/sec-tpm-osx.hpp b/src/security/sec-tpm-osx.hpp
similarity index 98%
rename from include/ndn-cpp-dev/security/sec-tpm-osx.hpp
rename to src/security/sec-tpm-osx.hpp
index 2ea9ff1..9834822 100644
--- a/include/ndn-cpp-dev/security/sec-tpm-osx.hpp
+++ b/src/security/sec-tpm-osx.hpp
@@ -9,7 +9,7 @@
#define NDN_SEC_TPM_OSX_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
-#include <ndn-cpp-dev/ndn-cpp-config.h>
+#include "ndn-cpp-config.h"
#if NDN_CPP_HAVE_OSX_SECURITY
#include "../common.hpp"
diff --git a/include/ndn-cpp-dev/security/sec-tpm.hpp b/src/security/sec-tpm.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/sec-tpm.hpp
rename to src/security/sec-tpm.hpp
diff --git a/include/ndn-cpp-dev/security/security-common.hpp b/src/security/security-common.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/security-common.hpp
rename to src/security/security-common.hpp
diff --git a/include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp b/src/security/signature-sha256-with-rsa.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
rename to src/security/signature-sha256-with-rsa.hpp
diff --git a/include/ndn-cpp-dev/security/validation-request.hpp b/src/security/validation-request.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/validation-request.hpp
rename to src/security/validation-request.hpp
diff --git a/src/security/verifier.cpp b/src/security/verifier.cpp
index 1734726..4abd14a 100644
--- a/src/security/verifier.cpp
+++ b/src/security/verifier.cpp
@@ -18,9 +18,9 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
-#include <ndn-cpp-dev/security/verifier.hpp>
+#include "security/verifier.hpp"
-#include <ndn-cpp-dev/security/sec-policy.hpp>
+#include "security/sec-policy.hpp"
#include <cryptopp/rsa.h>
diff --git a/include/ndn-cpp-dev/security/verifier.hpp b/src/security/verifier.hpp
similarity index 100%
rename from include/ndn-cpp-dev/security/verifier.hpp
rename to src/security/verifier.hpp
diff --git a/include/ndn-cpp-dev/signature.hpp b/src/signature.hpp
similarity index 100%
rename from include/ndn-cpp-dev/signature.hpp
rename to src/signature.hpp
diff --git a/include/ndn-cpp-dev/status-response.hpp b/src/status-response.hpp
similarity index 100%
rename from include/ndn-cpp-dev/status-response.hpp
rename to src/status-response.hpp
diff --git a/src/transport/tcp-transport.cpp b/src/transport/tcp-transport.cpp
index 2e78cc3..a12c223 100644
--- a/src/transport/tcp-transport.cpp
+++ b/src/transport/tcp-transport.cpp
@@ -8,8 +8,8 @@
#include <stdexcept>
#include <stdlib.h>
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/transport/tcp-transport.hpp>
+#include "face.hpp"
+#include "transport/tcp-transport.hpp"
#include <boost/asio.hpp>
#if NDN_CPP_HAVE_CXX11
diff --git a/include/ndn-cpp-dev/transport/tcp-transport.hpp b/src/transport/tcp-transport.hpp
similarity index 100%
rename from include/ndn-cpp-dev/transport/tcp-transport.hpp
rename to src/transport/tcp-transport.hpp
diff --git a/include/ndn-cpp-dev/transport/transport.hpp b/src/transport/transport.hpp
similarity index 97%
rename from include/ndn-cpp-dev/transport/transport.hpp
rename to src/transport/transport.hpp
index ddbff52..3c82c87 100644
--- a/include/ndn-cpp-dev/transport/transport.hpp
+++ b/src/transport/transport.hpp
@@ -8,7 +8,7 @@
#ifndef NDN_TRANSPORT_HPP
#define NDN_TRANSPORT_HPP
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#include <vector>
#include <boost/asio.hpp>
diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
index 5d26e15..e258f11 100644
--- a/src/transport/unix-transport.cpp
+++ b/src/transport/unix-transport.cpp
@@ -8,8 +8,8 @@
#include <stdexcept>
#include <stdlib.h>
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/transport/unix-transport.hpp>
+#include "face.hpp"
+#include "transport/unix-transport.hpp"
#include <boost/asio.hpp>
#if NDN_CPP_HAVE_CXX11
diff --git a/include/ndn-cpp-dev/transport/unix-transport.hpp b/src/transport/unix-transport.hpp
similarity index 100%
rename from include/ndn-cpp-dev/transport/unix-transport.hpp
rename to src/transport/unix-transport.hpp
diff --git a/src/util/crypto.cpp b/src/util/crypto.cpp
index ce17259..490feb8 100644
--- a/src/util/crypto.cpp
+++ b/src/util/crypto.cpp
@@ -4,7 +4,7 @@
* See COPYING for copyright and distribution information.
*/
-#include "ndn-cpp-dev/util/crypto.hpp"
+#include "util/crypto.hpp"
namespace ndn {
diff --git a/include/ndn-cpp-dev/util/crypto.hpp b/src/util/crypto.hpp
similarity index 94%
rename from include/ndn-cpp-dev/util/crypto.hpp
rename to src/util/crypto.hpp
index 8908a76..5fb5d35 100644
--- a/include/ndn-cpp-dev/util/crypto.hpp
+++ b/src/util/crypto.hpp
@@ -7,7 +7,7 @@
#ifndef NDN_UTIL_CRYPTO_HPP
#define NDN_UTIL_CRYPTO_HPP
-#include "ndn-cpp-dev/common.hpp"
+#include "common.hpp"
#include <openssl/ssl.h>
#include <openssl/rsa.h>
diff --git a/src/util/logging.hpp b/src/util/logging.hpp
index e9bf4d5..3f5848e 100644
--- a/src/util/logging.hpp
+++ b/src/util/logging.hpp
@@ -9,7 +9,7 @@
#ifndef NDN_LOGGING_HPP
#define NDN_LOGGING_HPP
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
#ifdef NDN_CPP_HAVE_LOG4CXX
diff --git a/src/util/ndnd-id-fetcher.hpp b/src/util/ndnd-id-fetcher.hpp
index e10eb38..a44dbbc 100644
--- a/src/util/ndnd-id-fetcher.hpp
+++ b/src/util/ndnd-id-fetcher.hpp
@@ -8,8 +8,8 @@
#ifndef NDN_NDND_ID_FETCHER_HPP
#define NDN_NDND_ID_FETCHER_HPP
-#include <ndn-cpp-dev/common.hpp>
-#include "ndn-cpp-dev/util/crypto.hpp"
+#include "common.hpp"
+#include "util/crypto.hpp"
namespace ndn {
diff --git a/src/util/time.hpp b/src/util/time.hpp
index 7b42b4a..8f110a9 100644
--- a/src/util/time.hpp
+++ b/src/util/time.hpp
@@ -8,7 +8,7 @@
#ifndef NDN_TIME_HPP
#define NDN_TIME_HPP
-#include "ndn-cpp-dev/common.hpp"
+#include "common.hpp"
#include <boost/date_time/posix_time/posix_time.hpp>
namespace ndn {
diff --git a/tests/test-encode-decode-block.cpp b/tests/test-encode-decode-block.cpp
index f14b83a..301f9c3 100644
--- a/tests/test-encode-decode-block.cpp
+++ b/tests/test-encode-decode-block.cpp
@@ -6,7 +6,7 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/interest.hpp>
+#include "interest.hpp"
using namespace std;
using namespace ndn;
diff --git a/tests/test-encode-decode-certificate.cpp b/tests/test-encode-decode-certificate.cpp
index 8da32bb..8a66d41 100644
--- a/tests/test-encode-decode-certificate.cpp
+++ b/tests/test-encode-decode-certificate.cpp
@@ -5,8 +5,8 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/security/certificate.hpp>
-#include <ndn-cpp-dev/security/public-key.hpp>
+#include "security/certificate.hpp"
+#include "security/public-key.hpp"
#if __clang__
#pragma clang diagnostic push
diff --git a/tests/test-encode-decode-data.cpp b/tests/test-encode-decode-data.cpp
index e8f5372..98685a7 100644
--- a/tests/test-encode-decode-data.cpp
+++ b/tests/test-encode-decode-data.cpp
@@ -6,8 +6,8 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/data.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include "data.hpp"
+#include "security/key-chain.hpp"
#include <fstream>
diff --git a/tests/test-encode-decode-forwarding-entry.cpp b/tests/test-encode-decode-forwarding-entry.cpp
index 9d06ed3..087b363 100644
--- a/tests/test-encode-decode-forwarding-entry.cpp
+++ b/tests/test-encode-decode-forwarding-entry.cpp
@@ -6,7 +6,7 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/forwarding-entry.hpp>
+#include "forwarding-entry.hpp"
#if __clang__
#pragma clang diagnostic push
diff --git a/tests/test-encode-decode-interest.cpp b/tests/test-encode-decode-interest.cpp
index e5fc83f..6c2a40e 100644
--- a/tests/test-encode-decode-interest.cpp
+++ b/tests/test-encode-decode-interest.cpp
@@ -6,7 +6,7 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/interest.hpp>
+#include "interest.hpp"
using namespace std;
using namespace ndn;
diff --git a/tests/test-faces.cpp b/tests/test-faces.cpp
index f43c71e..a8d6135 100644
--- a/tests/test-faces.cpp
+++ b/tests/test-faces.cpp
@@ -5,7 +5,7 @@
*/
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/face.hpp>
+#include "face.hpp"
using namespace std;
using namespace ndn;
diff --git a/tests/test-sec-tpm-file.cpp b/tests/test-sec-tpm-file.cpp
index a74a84b..5facdf4 100644
--- a/tests/test-sec-tpm-file.cpp
+++ b/tests/test-sec-tpm-file.cpp
@@ -18,7 +18,7 @@
#include <boost/test/unit_test.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include "security/key-chain.hpp"
#include <cryptopp/rsa.h>
using namespace std;
diff --git a/tests/test-time.cpp b/tests/test-time.cpp
index bc77fbd..d59400e 100644
--- a/tests/test-time.cpp
+++ b/tests/test-time.cpp
@@ -5,7 +5,7 @@
#include <boost/test/unit_test.hpp>
-#include <../src/util/time.hpp>
+#include "util/time.hpp"
BOOST_AUTO_TEST_SUITE(TestTime)
diff --git a/tools/ndncatchunks3.cpp b/tools/ndncatchunks3.cpp
index 7da6060..6bac64a 100644
--- a/tools/ndncatchunks3.cpp
+++ b/tools/ndncatchunks3.cpp
@@ -19,7 +19,8 @@
*/
-#include <ndn-cpp-dev/face.hpp>
+#include "face.hpp"
+
#include <stdexcept>
#include <iostream>
diff --git a/tools/ndnputchunks3.cpp b/tools/ndnputchunks3.cpp
index e19afe9..f6af9aa 100644
--- a/tools/ndnputchunks3.cpp
+++ b/tools/ndnputchunks3.cpp
@@ -18,8 +18,8 @@
* Author: Wentao Shang <wentao@cs.ucla.edu>
*/
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include "face.hpp"
+#include "security/key-chain.hpp"
#if NDN_CPP_HAVE_CXX11
// In the std library, the placeholders are in a different namespace than boost.
diff --git a/tools/tlvdump.cpp b/tools/tlvdump.cpp
index be80899..5793a40 100644
--- a/tools/tlvdump.cpp
+++ b/tools/tlvdump.cpp
@@ -5,8 +5,8 @@
* See COPYING for copyright and distribution information.
*/
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/encoding/block.hpp>
+#include "face.hpp"
+#include "encoding/block.hpp"
#include <iomanip>
#include <fstream>
diff --git a/wscript b/wscript
index f71a747..5adcddb 100644
--- a/wscript
+++ b/wscript
@@ -97,7 +97,7 @@
conf.env['USE_SYSTEM_BOOST'] = True
conf.define('USE_SYSTEM_BOOST', 1)
- conf.write_config_header('include/ndn-cpp-dev/ndn-cpp-config.h', define_prefix='NDN_CPP_')
+ conf.write_config_header('src/ndn-cpp-config.h', define_prefix='NDN_CPP_')
def build (bld):
libndn_cpp = bld (
@@ -108,8 +108,8 @@
source = bld.path.ant_glob('src/**/*.cpp',
excl = ['src/**/*-osx.cpp', 'src/**/*-sqlite3.cpp']),
use = 'BOOST OPENSSL LOG4CXX CRYPTOPP SQLITE3',
- includes = "include",
- export_includes = "include",
+ includes = "src",
+ export_includes = "src",
)
if Utils.unversioned_sys_platform () == "darwin":
@@ -157,12 +157,9 @@
headers = bld.path.ant_glob(['src/**/*.hpp',
'src/**/*.h'])
- bld.install_files("%s/ndn-cpp-dev" % bld.env['INCLUDEDIR'], headers, relative_trick=True, cwd=bld.path.find_node('src'))
+ bld.install_files("%s/src" % bld.env['INCLUDEDIR'], headers, relative_trick=True, cwd=bld.path.find_node('src'))
- bld.install_files("%s/ndn-cpp-dev" % bld.env['INCLUDEDIR'], bld.path.find_resource('include/ndn-cpp-dev/ndn-cpp-config.h'))
-
- headers = bld.path.ant_glob(['include/**/*.hpp', 'include/**/*.h'])
- bld.install_files("%s" % bld.env['INCLUDEDIR'], headers, relative_trick=True, cwd=bld.path.find_node('include'))
+ bld.install_files("%s/src" % bld.env['INCLUDEDIR'], bld.path.find_resource('ndn-cpp-config.h'))
@Configure.conf
def add_supported_cxxflags(self, cxxflags):