move public headers to codes subdir in tree

src/iokernellang/CodesIOKernelParser.h → codes/CodesIOKernelParser.h

 #ifndef CODESIOKERNELPARSER_H
 #define CODESIOKERNELPARSER_H
 
-#include "codesparser.h"
-#include "CodesIOKernelContext.h"
+#include "codes/codesparser.h"
+#include "codes/CodesIOKernelContext.h"
 
 YYLTYPE *CodesIOKernel_get_lloc  (yyscan_t yyscanner);
 int CodesIOKernel_lex_init (yyscan_t* scanner);

src/iokernellang/CodesIOKernelTypes.h → codes/CodesIOKernelTypes.h

 #ifndef CODES_H
 #define CODES_H
 
-#include "CodesIOKernelContext.h"
+#include "codes/CodesIOKernelContext.h"
 
 typedef enum { typeCon, typeId, typeOpr } nodeEnum;
 

src/iokernellang/CodesKernelHelpers.h → codes/CodesKernelHelpers.h

@@ -11,9 +11,9 @@
 #include <unistd.h>
 
 
-#include "iokernellang/CodesIOKernelTypes.h"
-#include "iokernellang/CodesIOKernelParser.h"
-#include "iokernellang/codeslexer.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelParser.h"
+#include "codes/codeslexer.h"
 
 #define CL_INST_MAX_ARGS 10
 

configure.ac

@@ -89,9 +89,6 @@ else
     AC_MSG_ERROR([Could not find usable ROSS installation, try --with-ross=DIR])
 fi
 
-# put include files in a codes/ subdir 
-includedir="${includedir}/codes"
-
 #
 # To reactivate rewriting of the codesparser.y file,
 # uncomment next line.

maint/codes-base.pc.in

 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/../
 ross_cflags=@ROSS_CFLAGS@
 ross_ldflags=@ROSS_LDFLAGS@
 ross_libs=@ROSS_LIBS@

src/Makefile.subdir

@@ -7,8 +7,8 @@ EXTRA_DIST += src/iokernellang/codesparser.y.in \
               src/iokernellang/codeslexer.l \
               src/modelconfig/configparser.y \
               src/modelconfig/configlex.l \
-              src/util/quicklist.h \
-              src/util/quickhash.h
+              codes/quicklist.h \
+              codes/quickhash.h
 
 PHONY: maintainer-clean-local
 maintainer-clean-local::
@@ -36,45 +36,46 @@ src/iokernellang/codesparser.c src/iokernellang/codesparser.h: src/iokernellang/
 
 EXTRA_DIST += src/iokernellang/codesparser.y
 
-include_HEADERS = \
-    src/iokernellang/CodesKernelHelpers.h \
-    src/iokernellang/CodesIOKernelContext.h \
-    src/iokernellang/CodesIOKernelParser.h \
-    src/iokernellang/CodesIOKernelTypes.h \
-    src/iokernellang/codeslexer.h \
-    src/modelconfig/txt_configfile.h \
-    src/util/tools.h \
-    src/logging/codeslogging.h \
-    src/logging/timeline.h \
-    src/iokernellang/codesparser.h 
+nobase_include_HEADERS = \
+    codes/CodesKernelHelpers.h \
+    codes/CodesIOKernelContext.h \
+    codes/CodesIOKernelParser.h \
+    codes/CodesIOKernelTypes.h \
+    codes/codeslexer.h \
+    codes/txt_configfile.h \
+    codes/tools.h \
+    codes/codeslogging.h \
+    codes/timeline.h \
+    codes/codesparser.h \
+    codes/quickhash.h \
+    codes/configfile.h \
+    codes/quicklist.h
 
 src_libcodes_base_a_SOURCES =  \
-    src/iokernellang/codesparser.h \
+    codes/codesparser.h \
     src/iokernellang/codesparser.c \
-    src/iokernellang/codeslexer.h \
+    codes/codeslexer.h \
     src/iokernellang/codeslexer.c \
     src/iokernellang/codesImpl.c \
-    src/iokernellang/CodesIOKernelContext.h \
-    src/iokernellang/CodesIOKernelParser.h \
-    src/iokernellang/CodesIOKernelTypes.h \
-    src/iokernellang/CodesKernelHelpers.h \
+    codes/CodesIOKernelContext.h \
+    codes/CodesIOKernelParser.h \
+    codes/CodesIOKernelTypes.h \
+    codes/CodesKernelHelpers.h \
     src/iokernellang/CodesKernelHelpers.c \
     src/modelconfig/configlex.c \
     src/modelconfig/configlex.h \
     src/modelconfig/configparser.c \
     src/modelconfig/configparser.h \
     src/modelconfig/configfile.c \
-    src/modelconfig/configfile.h \
     src/modelconfig/configglue.h \
     src/modelconfig/configglue.c \
-    src/modelconfig/configfile.h \
+    codes/configfile.h \
     src/modelconfig/configstore.h \
     src/modelconfig/configstore.c \
     src/modelconfig/configstoreadapter.h \
     src/modelconfig/configstoreadapter.c \
-    src/modelconfig/txt_configfile.c \
-    src/modelconfig/txt_configfile.h \
-    src/util/tools.h \
+    codes/txt_configfile.h \
+    codes/tools.h \
     src/util/tools.c \
     src/util/interval-merge-tree.h \
     src/util/interval-merge-tree.c \
@@ -82,7 +83,7 @@ src_libcodes_base_a_SOURCES =  \
     src/util/red-black-tree.c \
     src/util/codes-callbacks.h \
     src/util/codes-callbacks.c \
-    src/logging/codeslogging.h \
+    codes/codeslogging.h \
     src/logging/codeslogging.c \
-    src/logging/timeline.h \
+    codes/timeline.h \
     src/logging/timeline.c

src/iokernellang/CodesKernelHelpers.c

-#include "CodesKernelHelpers.h"
+#include "codes/CodesKernelHelpers.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/iokernellang/codesImpl.c

 #include <stdio.h>
 #include <stdlib.h>
-#include "CodesIOKernelTypes.h"
-#include "CodesIOKernelParser.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelParser.h"
 
 int64_t ex(
     nodeType * p)

src/iokernellang/codeslexer.l

 %{
 #include <stdlib.h>
-#include "CodesIOKernelTypes.h"
-#include "CodesIOKernelParser.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelParser.h"
 
 #define YY_NO_INPUT
 

src/iokernellang/codesparser.c

@@ -84,8 +84,8 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "CodesIOKernelTypes.h"
-#include "CodesIOKernelContext.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelContext.h"
 
 /* prototypes */
 nodeType *opr(int64_t oper, int64_t nops, ...);

src/iokernellang/codesparser.y

@@ -4,8 +4,8 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "CodesIOKernelTypes.h"
-#include "CodesIOKernelContext.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelContext.h"
 
 /* prototypes */
 nodeType *opr(int64_t oper, int64_t nops, ...);
@@ -56,7 +56,7 @@ int * group_size = NULL;
 %type <nPtr> stmt expr stmt_list
 
 %{
-	#include "CodesIOKernelContext.h"
+	#include "codes/CodesIOKernelContext.h"
 
 	int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner);
 

src/iokernellang/codesparser.y.in

@@ -4,8 +4,8 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "CodesIOKernelTypes.h"
-#include "CodesIOKernelContext.h"
+#include "codes/CodesIOKernelTypes.h"
+#include "codes/CodesIOKernelContext.h"
 
 /* prototypes */
 nodeType *opr(int64_t oper, int64_t nops, ...);

src/logging/codeslogging.c

@@ -22,7 +22,7 @@
 #include <execinfo.h>
 #endif
 
-#include "logging/codeslogging.h"
+#include "codes/codeslogging.h"
 #include <pthread.h>
 
 /** controls whether debugging is on or off */

src/logging/timeline.c

@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "timeline.h"
+#include "codes/timeline.h"
 
 // If timeline is not enabled, all functions are defined to noops
 #if TIMELINE_ENABLED == 1

src/modelconfig/configfile.c

@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #endif
 
-#include "configfile.h"
-#include "txt_configfile.h"
+#include "codes/configfile.h"
+#include "codes/txt_configfile.h"
 
 static int cf_equal_helper (ConfigHandle h1, SectionHandle s1, ConfigHandle h2, 
       SectionHandle s2)

src/modelconfig/configglue.c

 #include <stdio.h>
 #include <string.h>
 #include "configglue.h"
-#include "util/tools.h"
+#include "codes/tools.h"
 
 int cfgp_lex_error (ParserParams * p, int lineno, int colno, const char * msg)
 {

src/modelconfig/configglue.h

@@ -3,7 +3,7 @@
 
 /* Common header for parser and lexer */
 
-#include "configfile.h"
+#include "codes/configfile.h"
 
 
 typedef struct

src/modelconfig/configlex.c

@@ -481,7 +481,7 @@ static yyconst flex_int16_t yy_chk[111] =
 #include <string.h>
 #include "configglue.h"
 #include "configparser.h"
-#include "util/tools.h"
+#include "codes/tools.h"
 
 #define YY_EXTRA_TYPE ParserParams * 
 

src/modelconfig/configlex.l

 %{
 
 #include <string.h>
-#include "configglue.h"
-#include "configparser.h"
-#include "util/tools.h"
+#include "src/modelconfig/configglue.h"
+#include "src/modelconfig/configparser.h"
+#include "codes/tools.h"
 
 #define YY_EXTRA_TYPE ParserParams * 
 

src/modelconfig/configparser.c

@@ -176,7 +176,7 @@ typedef struct YYLTYPE
 
 #include "configlex.h"
 #include "configglue.h"
-#include "util/tools.h"
+#include "codes/tools.h"
 
 #if defined __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-parameter"

src/modelconfig/configparser.y

@@ -46,9 +46,9 @@
 
 #include <assert.h>
 
-#include "configlex.h"
-#include "configglue.h"
-#include "util/tools.h"
+#include "src/modelconfig/configlex.h"
+#include "src/modelconfig/configglue.h"
+#include "codes/tools.h"
 
 #if defined __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-parameter"

src/modelconfig/configstoreadapter.c

@@ -8,7 +8,7 @@
 
 #include <string.h>
 #include "configstoreadapter.h"
-#include "util/tools.h"
+#include "codes/tools.h"
 #include "configstore.h"
 
 static int cfsa_getKey (void *  handle, SectionHandle section, const char * name,

src/modelconfig/configstoreadapter.h

 #ifndef SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H
 #define SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H
 
-#include "configfile.h"
+#include "codes/configfile.h"
 #include "configstore.h"
 
 #ifdef __cplusplus

src/modelconfig/txt_configfile.c

 #include <assert.h>
 #include <stdio.h>
-#include "txt_configfile.h"
-#include "util/tools.h"
+#include "codes/txt_configfile.h"
+#include "codes/tools.h"
 #include "configglue.h"
 #include "configparser.h"
 #include "configlex.h"

src/util/tools.c

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "tools.h"
+#include "codes/tools.h"
 
 char * safe_strncpy(char * buf, const char * source, unsigned int size)
 {