From patchwork Tue Jan 3 22:25:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [esnacc-dev,RFC,4/5] cxx-lib: Rename all of the include directories X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 4 X-Patchwork-Delegate: aconole@bytheb.org Message-Id: <1483482316-10045-5-git-send-email-aconole@bytheb.org> To: dev@lists.esnacc.org Date: Tue, 3 Jan 2017 17:25:15 -0500 From: Aaron Conole List-Id: eSNACC Development discussion The c++ library includes all point to the cxx-lib/inc/ directory, now. This will facilitate moving away from having custom pkgconfig CCFLAGS for the include directories. Signed-off-by: Aaron Conole --- cxx-lib/inc/asn-incl.h | 16 ++++++++-------- cxx-lib/inc/asn-iomanip.h | 2 +- cxx-lib/inc/asn-listset.h | 2 +- cxx-lib/inc/snaccexcept.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cxx-lib/inc/asn-incl.h b/cxx-lib/inc/asn-incl.h index 5ec988c..00df67c 100644 --- a/cxx-lib/inc/asn-incl.h +++ b/cxx-lib/inc/asn-incl.h @@ -8,9 +8,9 @@ #define SNACC_CXX_ASN_INCL_H -#include "asn-config.h" -#include "asn-buf.h" -#include "snaccexcept.h" +#include "cxx-lib/inc/asn-config.h" +#include "cxx-lib/inc/asn-buf.h" +#include "cxx-lib/inc/snaccexcept.h" #ifdef WIN32 #if defined(_MSC_VER) @@ -24,7 +24,7 @@ #else // WIN32 #include #include - #include "asn-chartraits.h" + #include "cxx-lib/inc/asn-chartraits.h" #if defined(SunOS) || defined(SCO_SV) || defined(HPUX) || defined(HPUX32) namespace std @@ -41,7 +41,7 @@ #endif #if META -#include "meta.h" +#include "cxx-lib/inc/meta.h" #endif void SNACCDLL_API BDEC_2ND_EOC_OCTET(const SNACC::AsnBuf& b, @@ -1447,8 +1447,8 @@ enum SNACCEncodeDecodeRules { _END_SNACC_NAMESPACE -#include "asn-iomanip.h" -#include "snaccexcept.h" -#include "asn-usefultypes.h" +#include "cxx-lib/inc/asn-iomanip.h" +#include "cxx-lib/inc/snaccexcept.h" +#include "cxx-lib/inc/asn-usefultypes.h" #endif diff --git a/cxx-lib/inc/asn-iomanip.h b/cxx-lib/inc/asn-iomanip.h index 4338844..5a4bfae 100644 --- a/cxx-lib/inc/asn-iomanip.h +++ b/cxx-lib/inc/asn-iomanip.h @@ -1,7 +1,7 @@ #ifndef __ASN_IOMANIP_H__ #define __ASN_IOMANIP_H__ -#include "asn-config.h" +#include "cxx-lib/inc/asn-config.h" #include _BEGIN_SNACC_NAMESPACE diff --git a/cxx-lib/inc/asn-listset.h b/cxx-lib/inc/asn-listset.h index 96adc6c..cad72b4 100644 --- a/cxx-lib/inc/asn-listset.h +++ b/cxx-lib/inc/asn-listset.h @@ -8,7 +8,7 @@ #ifndef SNACC_ASN_LISTSET_H #define SNACC_ASN_LISTSET_H -#include "snacc.h" +#include "cxx-lib/inc/snacc.h" #ifdef _MSC_VER #pragma warning(disable: 4786) // Disable symbols truncated warning diff --git a/cxx-lib/inc/snaccexcept.h b/cxx-lib/inc/snaccexcept.h index 57b4f84..5054e14 100644 --- a/cxx-lib/inc/snaccexcept.h +++ b/cxx-lib/inc/snaccexcept.h @@ -16,7 +16,7 @@ #include #endif -#include "asn-config.h" +#include "cxx-lib/inc/asn-config.h" #define STACK_DEPTH 20