refactor some private headers out of the public eye

codes/configuration.h

@@ -7,9 +7,9 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
+#include <stddef.h>
 #include <inttypes.h>
 #include <mpi.h>
-#include "codes/txt_configfile.h"
 
 #define CONFIGURATION_MAX_NAME 256
 #define CONFIGURATION_MAX_GROUPS 10

src/Makefile.subdir

@@ -49,10 +49,8 @@ nobase_include_HEADERS = \
     codes/CodesIOKernelParser.h \
     codes/CodesIOKernelTypes.h \
     codes/codeslexer.h \
-    codes/txt_configfile.h \
     codes/codesparser.h \
     codes/quickhash.h \
-    codes/configfile.h \
     codes/quicklist.h \
     codes/codes_mapping.h \
     codes/lp-type-lookup.h \
@@ -87,16 +85,16 @@ src_libcodes_base_a_SOURCES =  \
     src/modelconfig/configfile.c \
     src/modelconfig/configglue.h \
     src/modelconfig/configglue.c \
-    codes/configfile.h \
+    src/modelconfig/configfile.h \
     src/modelconfig/configstore.h \
     src/modelconfig/configstore.c \
     src/modelconfig/configstoreadapter.h \
     src/modelconfig/configstoreadapter.c \
-    codes/txt_configfile.h \
+    src/modelconfig/txt_configfile.h \
     src/modelconfig/txt_configfile.c \
+    src/modelconfig/configuration.c \
     src/util/codes_mapping.c \
     src/util/lp-type-lookup.c \
-    src/util/configuration.c \
     src/util/lp-io.c \
 	src/util/lp-msg.c \
     src/util/lookup3.c \

src/modelconfig/configfile.c

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

src/modelconfig/configglue.h

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

src/modelconfig/configstoreadapter.h

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

src/util/configuration.c → src/modelconfig/configuration.c

@@ -13,6 +13,8 @@
 #include "codes/configuration.h"
 #include <ross.h>
 
+#include "configfile.h"
+
 /*
  * Global to hold configuration in memory
  */

src/modelconfig/txt_configfile.c

@@ -6,10 +6,10 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "codes/txt_configfile.h"
+#include "txt_configfile.h"
 #include "configglue.h"
-#include "src/modelconfig/configparser.h"
-#include "src/modelconfig/configlex.h"
+#include "configparser.h"
+#include "configlex.h"
 #include "configstoreadapter.h"
 
 #define MAX_CONFIG_SIZE 10*1024*1024