Delete slurm dir and relocate its content

diff --git a/src/Makefile.am b/src/Makefile.am
index 45c6127a83089c8e6489fb61253366fe240c8323..3375adda9e0a4147a3bea992b1ee24eafe08c340 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,10 @@ rtr_server_SOURCES += clients.c clients.h
 rtr_server_SOURCES += common.c common.h
 rtr_server_SOURCES += configuration.c configuration.h
 rtr_server_SOURCES += csv.c csv.h
+rtr_server_SOURCES += json_parser.c json_parser.h
 rtr_server_SOURCES += line_file.c line_file.h
 rtr_server_SOURCES += notify.c notify.h
+rtr_server_SOURCES += slurm_parser.c slurm_parser.h
 rtr_server_SOURCES += updates_daemon.c updates_daemon.h
 rtr_server_SOURCES += vrps.c vrps.h
 
@@ -24,9 +26,6 @@ rtr_server_SOURCES += rtr/primitive_reader.c rtr/primitive_reader.h
 rtr_server_SOURCES += rtr/primitive_writer.c rtr/primitive_writer.h
 rtr_server_SOURCES += rtr/rtr.c rtr/rtr.h
 
-rtr_server_SOURCES += slurm/json_parser.c slurm/json_parser.h
-rtr_server_SOURCES += slurm/slurm_parser.c slurm/slurm_parser.h
-
 rtr_server_SOURCES += crypto/base64.c crypto/base64.h
 
 rtr_server_LDADD = ${JANSSON_LIBS}

diff --git a/src/slurm/json_parser.c b/src/json_parser.c
similarity index 100%
rename from src/slurm/json_parser.c
rename to src/json_parser.c

diff --git a/src/slurm/json_parser.h b/src/json_parser.h
similarity index 69%
rename from src/slurm/json_parser.h
rename to src/json_parser.h
index 2b33d623efa33bf4e2a3f23a3942dbc75af6cb2f..4567452afe059c35b70b1f3c5a6dcebc921b6e1c 100644 (file)
--- a/src/slurm/json_parser.h
+++ b/src/json_parser.h
@@ -1,5 +1,5 @@
-#ifndef SRC_SLURM_JSON_PARSER_H_
-#define SRC_SLURM_JSON_PARSER_H_
+#ifndef SRC_JSON_PARSER_H_
+#define SRC_JSON_PARSER_H_
 
 #include <jansson.h>
 
@@ -8,4 +8,4 @@ int json_get_int(json_t *, char const *, json_int_t *);
 json_t *json_get_array(json_t *, char const *);
 json_t *json_get_object(json_t *, char const *);
 
-#endif /* SRC_SLURM_JSON_PARSER_H_ */
+#endif /* SRC_JSON_PARSER_H_ */

diff --git a/src/main.c b/src/main.c
index d55d59e32d9b3ee05fbc5c5d2c3539715e7e5424..1f13a8858a3c433731836430fd1efbde873f0972 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "rtr/rtr.h"
-#include "slurm/slurm_parser.h"
+#include "slurm_parser.h"
 #include "clients.h"
 #include "configuration.h"
 #include "csv.h"

diff --git a/src/slurm/slurm_parser.c b/src/slurm_parser.c
similarity index 99%
rename from src/slurm/slurm_parser.c
rename to src/slurm_parser.c
index 578daf4f63cfef4b81aeba024c40336672600df2..190f52f9a7987cd6d14f9b1a3dc1d834bf90a068 100644 (file)
--- a/src/slurm/slurm_parser.c
+++ b/src/slurm_parser.c
@@ -7,9 +7,9 @@
 #include <string.h>
 #include <openssl/evp.h>
 
-#include "../address.h"
-#include "../configuration.h"
-#include "../crypto/base64.h"
+#include "address.h"
+#include "configuration.h"
+#include "crypto/base64.h"
 #include "json_parser.h"
 
 /* JSON members */

diff --git a/src/slurm/slurm_parser.h b/src/slurm_parser.h
similarity index 76%
rename from src/slurm/slurm_parser.h
rename to src/slurm_parser.h
index 8378f121fc788491ae497b848cf1522e0f7494d8..208ef4c6f6e4b717c835a05780111087af045d62 100644 (file)
--- a/src/slurm/slurm_parser.h
+++ b/src/slurm_parser.h
@@ -1,5 +1,5 @@
-#ifndef SRC_SLURM_SLURM_PARSER_H_
-#define SRC_SLURM_SLURM_PARSER_H_
+#ifndef SRC_SLURM_PARSER_H_
+#define SRC_SLURM_PARSER_H_
 
 /* Flags to get data from structs */
 #define SLURM_COM_FLAG_NONE            0x00
@@ -16,4 +16,4 @@
 int slurm_load(void);
 void slurm_cleanup(void);
 
-#endif /* SRC_SLURM_SLURM_PARSER_H_ */
+#endif /* SRC_SLURM_PARSER_H_ */