CMakeLists maintenance (#1826)

Removed various superfluous declarations, and rewrote some parts to
be nicer or more consistent.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu

jerry-core/debugger/jerry-debugger-ws.c

@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
+#include "jcontext.h"
+#include "jerry-debugger.h"
+#include "jerryscript-port.h"
+
 #ifdef JERRY_DEBUGGER
 
 #include <arpa/inet.h>
@@ -20,10 +24,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "jcontext.h"
-#include "jerry-debugger.h"
-#include "jerryscript-port.h"
-
 /**
  * Debugger socket communication port.
  */

jerry-core/debugger/jerry-debugger-ws.h

@@ -16,10 +16,10 @@
 #ifndef JERRY_DEBUGGER_WS_H
 #define JERRY_DEBUGGER_WS_H
 
-#ifdef JERRY_DEBUGGER
-
 #include "ecma-globals.h"
 
+#ifdef JERRY_DEBUGGER
+
 /* JerryScript debugger protocol is a simplified version of RFC-6455 (WebSockets). */
 
 /**

jerry-core/debugger/jerry-debugger.c

@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef JERRY_DEBUGGER
-
 #include "byte-code.h"
 #include "ecma-builtin-helpers.h"
 #include "ecma-conversion.h"
@@ -25,6 +23,8 @@
 #include "jerryscript-port.h"
 #include "lit-char-helpers.h"
 
+#ifdef JERRY_DEBUGGER
+
 /**
  * Type cast the debugger send buffer into a specific type.
  */

jerry-core/debugger/jerry-debugger.h

@@ -16,11 +16,11 @@
 #ifndef JERRY_DEBUGGER_H
 #define JERRY_DEBUGGER_H
 
-#ifdef JERRY_DEBUGGER
-
 #include "jerry-debugger-ws.h"
 #include "ecma-globals.h"
 
+#ifdef JERRY_DEBUGGER
+
 /* JerryScript debugger protocol is a simplified version of RFC-6455 (WebSockets). */
 
 /**

jerry-core/debugger/jerry-sha1.c

@@ -40,10 +40,10 @@
  *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
-#ifdef JERRY_DEBUGGER
-
 #include "jerry-debugger.h"
 
+#ifdef JERRY_DEBUGGER
+
 /**
  * SHA-1 context structure.
  */