change #include "server.h" to <server/server.h>

Changes from the flat namespace to heirarchical one.  Instead of writing:

	#include "server.h"

the following form should be used.

	#include <server/server.h>

The exception is from .c files in the same directory.

diff --git a/src/ecosboard.c b/src/ecosboard.c
index d94f8b4738738a4d43e4eb97457333cec58b9a99..53ad7bab10f3b28bf3339f1de431288fd3b7e91c 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -30,7 +30,7 @@
 #include <flash/nand.h>
 #include "pld.h"
 
-#include "server.h"
+#include <server/server.h>
 #include "telnet_server.h"
 #include <server/gdb_server.h>
 #include "openocd.h"

diff --git a/src/helper/log.c b/src/helper/log.c
index 3067ecc56180fadcdbbc797c784cdecb0147eceb..6adde4b9dc7f8575791241396b11160f0d45ac2d 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -29,7 +29,7 @@
 
 #include "time_support.h"
 // @todo the inclusion of server.h here is a layering violation
-#include "server.h"
+#include <server/server.h>
 
 #include <stdarg.h>
 

diff --git a/src/helper/options.c b/src/helper/options.c
index 3db96fd713b5850bb70f8618ef2ba126a3cd6e65..573026a6e39f7396ce5e2b21b683810587e3575a 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -26,7 +26,7 @@
 
 #include "configuration.h"
 // @todo the inclusion of server.h here is a layering violation
-#include "server.h"
+#include <server/server.h>
 
 #include <getopt.h>
 

diff --git a/src/openocd.c b/src/openocd.c
index 58ad6178b2ac60927d775016ad1453a90b8ea3e0..cbb28b77ebf88d2bbd5503048fddc45d15867ee5 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -38,7 +38,7 @@
 #include "pld.h"
 #include <flash/mflash.h>
 
-#include "server.h"
+#include <server/server.h>
 #include <server/gdb_server.h>
 #include <server/httpd.h>
 

diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h
index e0d7b16662502c6fe8743a18324b1d28b4cf999a..68ad821280868e6ac744a308499adae8fb009cae 100644 (file)
--- a/src/server/tcl_server.h
+++ b/src/server/tcl_server.h
@@ -20,7 +20,7 @@
 #ifndef _TCL_SERVER_H_
 #define _TCL_SERVER_H_
 
-#include "server.h"
+#include <server/server.h>
 
 int tcl_init(struct command_context *cmd_ctx);
 int tcl_register_commands(struct command_context *cmd_ctx);

diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h
index 7e398222076a7a1de4965f9cd13cda3841cbfec8..b0c5ceb35d84d3dfeab5d125bfcc0ce7553c7e42 100644 (file)
--- a/src/server/telnet_server.h
+++ b/src/server/telnet_server.h
@@ -26,7 +26,7 @@
 #ifndef TELNET_SERVER_H
 #define TELNET_SERVER_H
 
-#include "server.h"
+#include <server/server.h>
 
 #define TELNET_BUFFER_SIZE (1024)