move headers from src/api to src/yajl

This makes not necessary copy the headers on a secondary location
unnecessary.

22 files changed, 21 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 1f11f1f..3019b38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ aclocal.m4
 .version
 config.*
 libtool
-src/api/yajl_version.h
+src/yajl/yajl_version.h
 stamp-h1
 configure
 json_reformat
diff --git a/Makefile.am b/Makefile.am
index f6e2fa3..0568a7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,10 @@ dist_doc_DATA = TODO README
 
 lib_LTLIBRARIES = libyail.la
 
-pkginclude_HEADERS = src/api/yajl_parse.h \
-		     src/api/yajl_gen.h \
-		     src/api/yajl_common.h \
-		     src/api/yajl_version.h
+pkginclude_HEADERS = src/yajl/yajl_parse.h \
+		     src/yajl/yajl_gen.h \
+		     src/yajl/yajl_common.h \
+		     src/yajl/yajl_version.h
 
 libyail_la_SOURCES = src/yajl.c \
 		     src/yajl_lex.c \
@@ -49,5 +49,5 @@ libyail_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 ACLOCAL_AMFLAGS = -I m4
 
-INCLUDES = -I. -I${top_srcdir}/src -I${top_srcdir}/src/api
+INCLUDES = -I. -I${top_srcdir}/src -I${top_srcdir}/src/yajl
 
diff --git a/configure.ac b/configure.ac
index 55fab7a..c3bd773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_SUBST(YAJL_MINOR)
 AC_SUBST(YAJL_MICRO)
 
 AC_CONFIG_FILES([Makefile
-                 src/api/yajl_version.h
+                 src/yajl/yajl_version.h
                  pkgconfig/yajl.pc
                  pkgconfig/yajl-uninstalled.pc])
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e36b736..71ba1a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,7 @@ SET (SRCS yajl.c yajl_lex.c yajl_parser.c yajl_buf.c
           yajl_tree.c yajl_version.c
 )
 SET (HDRS yajl_parser.h yajl_lex.h yajl_buf.h yajl_encode.h yajl_alloc.h)
-SET (PUB_HDRS api/yajl_parse.h api/yajl_gen.h api/yajl_common.h api/yajl_tree.h)
+SET (PUB_HDRS yajl/yajl_parse.h api/yajl_gen.h api/yajl_common.h api/yajl_tree.h)
 
 # useful when fixing lexer bugs.
 #ADD_DEFINITIONS(-DYAJL_LEXER_DEBUG)
@@ -60,7 +60,7 @@ FILE(MAKE_DIRECTORY ${incDir})
 
 # generate build-time source
 SET(dollar $)
-CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
+CONFIGURE_FILE(yajl/yajl_version.h.cmake ${incDir}/yajl_version.h)
 CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
 
 # copy public headers to output directory
diff --git a/src/YAJL.dxy b/src/YAJL.dxy
index 57c720c..31f7ad3 100644
--- a/src/YAJL.dxy
+++ b/src/YAJL.dxy
@@ -463,7 +463,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  =  ../src/yajl ../src/api
+INPUT                  =  ../src/yajl.doxy ../src/yajl
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
diff --git a/src/yajl.c b/src/yajl.c
index 293e545..54e6474 100644
--- a/src/yajl.c
+++ b/src/yajl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_lex.h"
 #include "yajl_parser.h"
 #include "yajl_alloc.h"
diff --git a/src/yajl b/src/yajl.doxy
index b04c170..b04c170 100644
--- a/src/yajl
+++ b/src/yajl.doxy
diff --git a/src/api/yajl_common.h b/src/yajl/yajl_common.h
index b208fd7..b208fd7 100644
--- a/src/api/yajl_common.h
+++ b/src/yajl/yajl_common.h
diff --git a/src/api/yajl_gen.h b/src/yajl/yajl_gen.h
index 52fa99f..52fa99f 100644
--- a/src/api/yajl_gen.h
+++ b/src/yajl/yajl_gen.h
diff --git a/src/api/yajl_parse.h b/src/yajl/yajl_parse.h
index 55c8311..55c8311 100644
--- a/src/api/yajl_parse.h
+++ b/src/yajl/yajl_parse.h
diff --git a/src/api/yajl_tree.h b/src/yajl/yajl_tree.h
index 729c579..729c579 100644
--- a/src/api/yajl_tree.h
+++ b/src/yajl/yajl_tree.h
diff --git a/src/api/yajl_version.h.cmake b/src/yajl/yajl_version.h.cmake
index 4262ff7..4262ff7 100644
--- a/src/api/yajl_version.h.cmake
+++ b/src/yajl/yajl_version.h.cmake
diff --git a/src/api/yajl_version.h.in b/src/yajl/yajl_version.h.in
index ecc221d..ecc221d 100644
--- a/src/api/yajl_version.h.in
+++ b/src/yajl/yajl_version.h.in
diff --git a/src/yajl_alloc.h b/src/yajl_alloc.h
index 85dbad0..a8a9e45 100644
--- a/src/yajl_alloc.h
+++ b/src/yajl_alloc.h
@@ -23,7 +23,7 @@
 #ifndef __YAJL_ALLOC_H__
 #define __YAJL_ALLOC_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 #define YA_MALLOC(afs, sz) (afs)->malloc((afs)->ctx, (sz))
 #define YA_FREE(afs, ptr) (afs)->free((afs)->ctx, (ptr))
diff --git a/src/yajl_buf.h b/src/yajl_buf.h
index 682457f..94929a5 100644
--- a/src/yajl_buf.h
+++ b/src/yajl_buf.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_BUF_H__
 #define __YAJL_BUF_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 #include "yajl_alloc.h"
 
 /*
diff --git a/src/yajl_bytestack.h b/src/yajl_bytestack.h
index 8c34b71..1fc50c4 100644
--- a/src/yajl_bytestack.h
+++ b/src/yajl_bytestack.h
@@ -22,7 +22,7 @@
 #ifndef __YAJL_BYTESTACK_H__
 #define __YAJL_BYTESTACK_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 #define YAJL_BS_INC 128
 
diff --git a/src/yajl_encode.h b/src/yajl_encode.h
index ac7acc6..af1e8bb 100644
--- a/src/yajl_encode.h
+++ b/src/yajl_encode.h
@@ -18,7 +18,7 @@
 #define __YAJL_ENCODE_H__
 
 #include "yajl_buf.h"
-#include "api/yajl_gen.h"
+#include "yajl/yajl_gen.h"
 
 void yajl_string_encode(const yajl_print_t printer,
                         void * ctx,
diff --git a/src/yajl_gen.c b/src/yajl_gen.c
index 8605982..62abbff 100644
--- a/src/yajl_gen.c
+++ b/src/yajl_gen.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_gen.h"
+#include "yajl/yajl_gen.h"
 #include "yajl_buf.h"
 #include "yajl_encode.h"
 
diff --git a/src/yajl_lex.h b/src/yajl_lex.h
index 20edf47..cbaae0c 100644
--- a/src/yajl_lex.h
+++ b/src/yajl_lex.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_LEX_H__
 #define __YAJL_LEX_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 typedef enum {
     yajl_tok_bool,         
diff --git a/src/yajl_parser.c b/src/yajl_parser.c
index 3903b38..bf9ef24 100644
--- a/src/yajl_parser.c
+++ b/src/yajl_parser.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_lex.h"
 #include "yajl_parser.h"
 #include "yajl_encode.h"
diff --git a/src/yajl_parser.h b/src/yajl_parser.h
index c12fc1b..5340973 100644
--- a/src/yajl_parser.h
+++ b/src/yajl_parser.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_PARSER_H__
 #define __YAJL_PARSER_H__
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_bytestack.h"
 #include "yajl_buf.h"
 #include "yajl_lex.h"
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
index 111e49f..125d400 100644
--- a/src/yajl_tree.c
+++ b/src/yajl_tree.c
@@ -20,8 +20,8 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "api/yajl_tree.h"
-#include "api/yajl_parse.h"
+#include "yajl/yajl_tree.h"
+#include "yajl/yajl_parse.h"
 
 #include "yajl_parser.h"