From d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50 Mon Sep 17 00:00:00 2001
From: Gregor Burger <gregor.burger@bhs-technologies.com>
Date: Tue, 20 Nov 2018 11:48:03 +0100
Subject: move all public headers to include/nng/ folder

This change makes embedding nng + nggpp (or other projects depending on
nng) in cmake easier.  The header files are moved to a separate include
directory.  This also makes installation of the headers easier, and
allows clearer identification of private vs public heade files.

Some additional cleanups were performed by @gedamore, but the main
credit for this change belongs with @gregorburger.
---
 src/protocol/pair0/CMakeLists.txt |  4 +---
 src/protocol/pair0/pair.c         |  2 +-
 src/protocol/pair0/pair.h         | 34 ----------------------------------
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 src/protocol/pair0/pair.h

(limited to 'src/protocol/pair0')

diff --git a/src/protocol/pair0/CMakeLists.txt b/src/protocol/pair0/CMakeLists.txt
index c453b07f..72d04888 100644
--- a/src/protocol/pair0/CMakeLists.txt
+++ b/src/protocol/pair0/CMakeLists.txt
@@ -14,10 +14,8 @@ mark_as_advanced(NNG_PROTO_PAIR0)
 
 if (NNG_PROTO_PAIR0)
     set(_DEFS -DNNG_HAVE_PAIR0)
-    set(_SRCS protocol/pair0/pair.c protocol/pair0/pair.h)
-    set(_HDRS protocol/pair0/pair.h)
+    set(_SRCS protocol/pair0/pair.c ${PROJECT_SOURCE_DIR}/include/nng/protocol/pair0/pair.h)
 
     set(NNG_DEFS ${NNG_DEFS} ${_DEFS} PARENT_SCOPE)
     set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE)
-    set(NNG_HDRS ${NNG_HDRS} ${_HDRS} PARENT_SCOPE)
 endif()
diff --git a/src/protocol/pair0/pair.c b/src/protocol/pair0/pair.c
index d663c5e2..fef2acaf 100644
--- a/src/protocol/pair0/pair.c
+++ b/src/protocol/pair0/pair.c
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #include "core/nng_impl.h"
-#include "protocol/pair0/pair.h"
+#include "nng/protocol/pair0/pair.h"
 
 // Pair protocol.  The PAIR protocol is a simple 1:1 messaging pattern.
 // While a peer is connected to the server, all other peer connection
diff --git a/src/protocol/pair0/pair.h b/src/protocol/pair0/pair.h
deleted file mode 100644
index 1356f1cd..00000000
--- a/src/protocol/pair0/pair.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
-// Copyright 2018 Capitar IT Group BV <info@capitar.com>
-//
-// This software is supplied under the terms of the MIT License, a
-// copy of which should be located in the distribution where this
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-#ifndef NNG_PROTOCOL_PAIR0_PAIR_H
-#define NNG_PROTOCOL_PAIR0_PAIR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-NNG_DECL int nng_pair0_open(nng_socket *);
-
-NNG_DECL int nng_pair0_open_raw(nng_socket *);
-
-#ifndef nng_pair_open
-#define nng_pair_open nng_pair0_open
-#endif
-
-#ifndef nng_pair_open_raw
-#define nng_pair_open_raw nng_pair0_open_raw
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // NNG_PROTOCOL_PAIR0_PAIR_H
-- 
cgit v1.2.3-70-g09d2