Remove include directory

vrahane · vrahane · commit 12230abeae99 · 2017-12-06T18:55:19.000-08:00
- Initially added include directory is now removed
- Source files and headers are placed in the source directory
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ prefix = /usr/local
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
+includedir = $(prefix)/src
 pkgconfigdir = $(libdir)/pkgconfig
 
 CFLAGS = -Wall -Wextra
@@ -20,7 +20,12 @@ RMDIR = rmdir
 SED = sed
 
 # Our sources
-TINYCBOR_HEADERS = include
+TINYCBOR_HEADERS = \
+	src/cbor.h \
+ 	src/cborjson.h \
+	src/cbor_enocoder_writer.h \
+	src/cbor_decoder_reader.h \
+	src/cbor_defs.h
 TINYCBOR_SOURCES = \
 	src/cborerrorstrings.c \
 	src/cborencoder.c \
@@ -29,7 +34,7 @@ TINYCBOR_SOURCES = \
 	src/cborpretty.c \
 	src/cbortojson.c \
 	src/cborvalidation.c \
-	src/cbor_buf_reader.c\
+	src/cbor_buf_reader.c \
 	src/cbor_buf_writer.c
 #
 CBORDUMP_SOURCES = tools/cbordump/cbordump.c
@@ -44,7 +49,7 @@ INSTALL_TARGETS += $(libdir)/libtinycbor.so.0
 INSTALL_TARGETS += $(libdir)/libtinycbor.so.$(VERSION)
 endif
 INSTALL_TARGETS += $(pkgconfigdir)/tinycbor.pc
-INSTALL_TARGETS += $(TINYCBOR_HEADERS:./%=$(includedir)/tinycbor/%)
+INSTALL_TARGETS += $(TINYCBOR_HEADERS:./%=$(includedir)/%)
 
 # setup VPATH
 MAKEFILE := $(lastword $(MAKEFILE_LIST))
@@ -157,7 +162,7 @@ $(DESTDIR)$(bindir)/%: bin/%
 $(DESTDIR)$(pkgconfigdir)/%: %
 	$(INSTALL) -d $(@D)
 	$(INSTALL_DATA) $< $@
-$(DESTDIR)$(includedir)/%: include/%
+$(DESTDIR)$(includedir)/%: src/%
 	$(INSTALL) -d $(@D)
 	$(INSTALL_DATA) $< $@
 
@@ -201,7 +206,7 @@ tag: distcheck
 .PHONY: docs dist distcheck release
 .SECONDARY:
 
-cflags := $(CPPFLAGS) -I$(SRCDIR)include
+cflags := $(CPPFLAGS) -I$(SRCDIR)/src
 cflags += -DTINYCBOR_VERSION_SUFFIX=\"$(DIRTYSRC)\"
 cflags += -std=c99 $(CFLAGS)
 %.o: %.c
diff --git a/Makefile.nmake b/Makefile.nmake
@@ -1,6 +1,6 @@
 CFLAGS = -W3
 
-TINYCBOR_HEADERS = include
+TINYCBOR_HEADERS = src
 TINYCBOR_SOURCES = \
 	src\cborerrorstrings.c \
 	src\cborencoder.c \
diff --git a/src/cbor.h b/src/cbor.h
@@ -31,10 +31,10 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <tinycbor/cbor_buf_writer.h>
-#include <tinycbor/cbor_buf_reader.h>
-#include <tinycbor/cbor_defs.h>
-#include "tinycbor/tinycbor-version.h"
+#include "cbor_buf_writer.h"
+#include "cbor_buf_reader.h"
+#include "cbor_defs.h"
+#include "tinycbor-version.h"
 
 #define TINYCBOR_VERSION            ((TINYCBOR_VERSION_MAJOR << 16) | (TINYCBOR_VERSION_MINOR << 8) | TINYCBOR_VERSION_PATCH)
 
diff --git a/src/cbor_buf_reader.c b/src/cbor_buf_reader.c
@@ -22,8 +22,8 @@
 **
 ****************************************************************************/
 
-#include <tinycbor/cbor_buf_reader.h>
-#include <tinycbor/compilersupport_p.h>
+#include "cbor_buf_reader.h"
+#include "compilersupport_p.h"
 
 CBOR_INLINE_API uint16_t get16(const uint8_t *ptr)
 {
diff --git a/src/cbor_buf_reader.h b/src/cbor_buf_reader.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include <tinycbor/cbor_decoder_reader.h>
+#include "cbor_decoder_reader.h"
 
 struct cbor_buf_reader {
     struct cbor_decoder_reader r;
diff --git a/src/cbor_buf_writer.c b/src/cbor_buf_writer.c
@@ -22,8 +22,8 @@
 **
 ****************************************************************************/
 
-#include <tinycbor/cbor.h>
-#include <tinycbor/cbor_buf_writer.h>
+#include "cbor.h"
+#include "cbor_buf_writer.h"
 
 CBOR_INLINE_API int
 would_overflow(struct cbor_buf_writer *cb, size_t len)
diff --git a/src/cbor_buf_writer.h b/src/cbor_buf_writer.h
@@ -25,7 +25,7 @@
 #ifndef CBOR_BUF_WRITER_H
 #define CBOR_BUF_WRITER_H
 
-#include <tinycbor/cbor_encoder_writer.h>
+#include "cbor_encoder_writer.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/cbor_cnt_writer.h b/src/cbor_cnt_writer.h
diff --git a/src/cbor_decoder_reader.h b/src/cbor_decoder_reader.h
diff --git a/src/cbor_defs.h b/src/cbor_defs.h
diff --git a/src/cbor_encoder_writer.h b/src/cbor_encoder_writer.h
diff --git a/src/cborconstants_p.h b/src/cborconstants_p.h
diff --git a/src/cborencoder.c b/src/cborencoder.c
@@ -28,10 +28,10 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborconstants_p.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/cbor_buf_writer.h"
+#include "cbor.h"
+#include "cborconstants_p.h"
+#include "compilersupport_p.h"
+#include "cbor_buf_writer.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/cborerrorstrings.c b/src/cborerrorstrings.c
@@ -22,8 +22,8 @@
 **
 ****************************************************************************/
 
-#include "tinycbor/cbor_defs.h"
-#include "tinycbor/cbor.h"
+#include "cbor_defs.h"
+#include "cbor.h"
 
 #ifndef _
 #  define _(msg)    msg
diff --git a/src/cborinternal_p.h b/src/cborinternal_p.h
@@ -25,7 +25,7 @@
 #ifndef CBORINTERNAL_P_H
 #define CBORINTERNAL_P_H
 
-#include "tinycbor/compilersupport_p.h"
+#include "compilersupport_p.h"
 
 #ifndef CBOR_INTERNAL_API
 #  define CBOR_INTERNAL_API
diff --git a/src/cborjson.h b/src/cborjson.h
diff --git a/src/cborparser.c b/src/cborparser.c
@@ -28,13 +28,13 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborconstants_p.h"
-#include "tinycbor/compilersupport_p.h"
+#include "cbor.h"
+#include "cborconstants_p.h"
+#include "compilersupport_p.h"
 
 #include <string.h>
 
-#include <tinycbor/cbor_buf_reader.h>
+#include "cbor_buf_reader.h"
 
 #ifndef CBOR_PARSER_MAX_RECURSIONS
 #  define CBOR_PARSER_MAX_RECURSIONS 1024
diff --git a/src/cborparser_dup_string.c b/src/cborparser_dup_string.c
@@ -28,9 +28,9 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
+#include "cbor.h"
 #include <stdlib.h>
-#include "tinycbor/compilersupport_p.h"
+#include "compilersupport_p.h"
 
 /**
  * \fn CborError cbor_value_dup_text_string(const CborValue *value, char **buffer, size_t *buflen, CborValue *next)
diff --git a/src/cborpretty.c b/src/cborpretty.c
@@ -28,10 +28,10 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/cborinternal_p.h"
-#include "tinycbor/utf8_p.h"
+#include "cbor.h"
+#include "compilersupport_p.h"
+#include "cborinternal_p.h"
+#include "utf8_p.h"
 
 #include <float.h>
 #include <inttypes.h>
diff --git a/src/cbortojson.c b/src/cbortojson.c
@@ -30,9 +30,9 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborjson.h"
-#include "tinycbor/compilersupport_p.h"
+#include "cbor.h"
+#include "cborjson.h"
+#include "compilersupport_p.h"
 
 #include <float.h>
 #include <inttypes.h>
diff --git a/src/cborvalidation.c b/src/cborvalidation.c
@@ -28,10 +28,10 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborinternal_p.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/utf8_p.h"
+#include "cbor.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+#include "utf8_p.h"
 
 #include <string.h>
 
diff --git a/src/compilersupport_p.h b/src/compilersupport_p.h
diff --git a/src/open_memstream.c b/src/open_memstream.c
@@ -47,7 +47,7 @@ typedef size_t LenType;
 #  error "Cannot implement open_memstream!"
 #endif
 
-#include "tinycbor/compilersupport_p.h"
+#include "compilersupport_p.h"
 
 struct Buffer
 {
diff --git a/src/src.pri b/src/src.pri
@@ -13,5 +13,5 @@ SOURCES += \
 HEADERS += $$PWD/cbor.h $$PWD/tinycbor-version.h
 QMAKE_CFLAGS *= $$QMAKE_CFLAGS_SPLIT_SECTIONS
 QMAKE_LFLAGS *= $$QMAKE_LFLAGS_GCSECTIONS
-INCLUDEPATH += $$PWD/include
+INCLUDEPATH += $$PWD/
 CONFIG(release, debug|release): DEFINES += NDEBUG
diff --git a/src/tinycbor-version.h b/src/tinycbor-version.h
diff --git a/src/utf8_p.h b/src/utf8_p.h
@@ -22,7 +22,7 @@
 **
 ****************************************************************************/
 
-#include "tinycbor/compilersupport_p.h"
+#include "compilersupport_p.h"
 
 #include <stdint.h>
 
diff --git a/tests/cpp/cpp.pro b/tests/cpp/cpp.pro
@@ -2,7 +2,7 @@ CONFIG += testcase parallel_test c++11
 QT = core testlib
 
 SOURCES = tst_cpp.cpp
-INCLUDEPATH += ../../include/
+INCLUDEPATH += ../../src/
 msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib
 else: POST_TARGETDEPS += ../../lib/libtinycbor.a
 LIBS += $$POST_TARGETDEPS
diff --git a/tests/encoder/encoder.pro b/tests/encoder/encoder.pro
@@ -3,7 +3,7 @@ SOURCES += tst_encoder.cpp
 CONFIG += testcase parallel_test c++11
 QT = core testlib
 
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../../src
 msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib
 else: POST_TARGETDEPS += ../../lib/libtinycbor.a
 LIBS += $$POST_TARGETDEPS
diff --git a/tests/encoder/tst_encoder.cpp b/tests/encoder/tst_encoder.cpp
@@ -23,8 +23,8 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include "tinycbor/cbor.h"
-#include "tinycbor/cbor_buf_writer.h"
+#include "cbor.h"
+#include "cbor_buf_writer.h"
 
 Q_DECLARE_METATYPE(CborError)
 
diff --git a/tests/parser/parser.pro b/tests/parser/parser.pro
@@ -4,7 +4,7 @@ CONFIG += testcase parallel_test c++11
 QT = core testlib
 DEFINES += CBOR_PARSER_MAX_RECURSIONS=16
 
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../../src
 msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib
 else: POST_TARGETDEPS += ../../lib/libtinycbor.a
 LIBS += $$POST_TARGETDEPS
diff --git a/tests/parser/tst_parser.cpp b/tests/parser/tst_parser.cpp
@@ -24,8 +24,8 @@
 
 #define _XOPEN_SOURCE 700
 #include <QtTest>
-#include "tinycbor/cbor.h"
-#include "tinycbor/cbor_buf_reader.h"
+#include "cbor.h"
+#include "cbor_buf_reader.h"
 #include <locale.h>
 #include <stdio.h>
 
diff --git a/tests/tojson/tojson.pro b/tests/tojson/tojson.pro
@@ -2,7 +2,7 @@ CONFIG += testcase parallel_test c++11
 QT = core testlib
 
 SOURCES += tst_tojson.cpp
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../../src
 msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib
 else: POST_TARGETDEPS += ../../lib/libtinycbor.a
 LIBS += $$POST_TARGETDEPS
diff --git a/tests/tojson/tst_tojson.cpp b/tests/tojson/tst_tojson.cpp
@@ -23,8 +23,8 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborjson.h"
+#include "cbor.h"
+#include "cborjson.h"
 #include <locale.h>
 
 extern "C" FILE *open_memstream(char **bufptr, size_t *sizeptr);
diff --git a/tools/cbordump/cbordump.c b/tools/cbordump/cbordump.c
@@ -23,9 +23,9 @@
 ****************************************************************************/
 
 #define _POSIX_C_SOURCE 200809L
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborjson.h"
-#include "tinycbor/cbor_buf_reader.h"
+#include "cbor.h"
+#include "cborjson.h"
+#include "cbor_buf_reader.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`**`
`23`	`23`	`****************************************************************************/`
`24`	`24`
`25`		`-#include <tinycbor/cbor_buf_reader.h>`
`26`		`-#include <tinycbor/compilersupport_p.h>`
	`25`	`+#include "cbor_buf_reader.h"`
	`26`	`+#include "compilersupport_p.h"`
`27`	`27`
`28`	`28`	`CBOR_INLINE_API uint16_t get16(const uint8_t *ptr)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ typedef size_t LenType;`
`47`	`47`	`# error "Cannot implement open_memstream!"`
`48`	`48`	`#endif`
`49`	`49`
`50`		`-#include "tinycbor/compilersupport_p.h"`
	`50`	`+#include "compilersupport_p.h"`
`51`	`51`
`52`	`52`	`struct Buffer`
`53`	`53`	`{`