From 3e3cb08c7f37114975f30ed1db9d3dbdf1f2dbbc Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 26 May 2018 15:26:20 +0100
Subject: [PATCH] Move serialdump and tunslip6 to their own subdir

---
 .gitignore                          |  4 ++--
 Makefile.tools                      | 16 +++++++++-------
 tools/{ => serial-io}/Makefile      |  0
 tools/{ => serial-io}/serialdump.c  |  0
 tools/{ => serial-io}/tools-utils.c |  3 +--
 tools/{ => serial-io}/tools-utils.h |  0
 tools/{ => serial-io}/tunslip6.c    |  0
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename tools/{ => serial-io}/Makefile (100%)
 rename tools/{ => serial-io}/serialdump.c (100%)
 rename tools/{ => serial-io}/tools-utils.c (99%)
 rename tools/{ => serial-io}/tools-utils.h (100%)
 rename tools/{ => serial-io}/tunslip6.c (100%)

diff --git a/.gitignore b/.gitignore
index 8bcfac060..6bab22c32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,8 @@ Makefile.target
 Makefile.*.defines
 tools/doxygen/html
 patches-*
-tools/tunslip6
-tools/serialdump
+tools/serial-io/tunslip6
+tools/serial-io/serialdump
 serialdump-*
 build
 tools/coffee-manager/build/
diff --git a/Makefile.tools b/Makefile.tools
index 041f383b6..6151ba83a 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -3,13 +3,15 @@
 # recursively invoke the respective build under tools/.
 
 TOOLS_DIR = $(CONTIKI)/tools
-TOOL_DEPS = $(TOOLS_DIR)/tools-utils.c $(TOOLS_DIR)/tools-utils.h
+SERIAL_IO_TOOL_DIR = $(TOOLS_DIR)/serial-io
 
-TUNSLIP6 = $(TOOLS_DIR)/tunslip6
-SERIAL_DUMP_BIN = $(TOOLS_DIR)/serialdump
+SERIAL_IO_TOOL_DEPS = $(addprefix $(SERIAL_IO_TOOL_DIR)/, tools-utils.c tools-utils.h)
 
-$(SERIAL_DUMP_BIN): $(TOOLS_DIR)/serialdump.c $(TOOL_DEPS)
-	make -C $(TOOLS_DIR) serialdump
+TUNSLIP6 = $(SERIAL_IO_TOOL_DIR)/tunslip6
+SERIAL_DUMP_BIN = $(SERIAL_IO_TOOL_DIR)/serialdump
 
-$(TUNSLIP6): $(TOOLS_DIR)/tunslip6.c $(TOOL_DEPS)
-	make -C $(TOOLS_DIR) tunslip6
+$(SERIAL_DUMP_BIN): $(SERIAL_IO_TOOL_DIR)/serialdump.c $(SERIAL_IO_TOOL_DEPS)
+	make -C $(SERIAL_IO_TOOL_DIR) serialdump
+
+$(TUNSLIP6): $(SERIAL_IO_TOOL_DIR)/tunslip6.c $(SERIAL_IO_TOOL_DEPS)
+	make -C $(SERIAL_IO_TOOL_DIR) tunslip6
diff --git a/tools/Makefile b/tools/serial-io/Makefile
similarity index 100%
rename from tools/Makefile
rename to tools/serial-io/Makefile
diff --git a/tools/serialdump.c b/tools/serial-io/serialdump.c
similarity index 100%
rename from tools/serialdump.c
rename to tools/serial-io/serialdump.c
diff --git a/tools/tools-utils.c b/tools/serial-io/tools-utils.c
similarity index 99%
rename from tools/tools-utils.c
rename to tools/serial-io/tools-utils.c
index 50a50c025..8e292e9b3 100644
--- a/tools/tools-utils.c
+++ b/tools/serial-io/tools-utils.c
@@ -30,7 +30,7 @@
  *
  */
 
-#include "tools-utils.h" 
+#include "tools-utils.h"
 
 speed_t
 select_baudrate(int baudrate) {
@@ -159,4 +159,3 @@ select_baudrate(int baudrate) {
     return 0;
   }
 }
-
diff --git a/tools/tools-utils.h b/tools/serial-io/tools-utils.h
similarity index 100%
rename from tools/tools-utils.h
rename to tools/serial-io/tools-utils.h
diff --git a/tools/tunslip6.c b/tools/serial-io/tunslip6.c
similarity index 100%
rename from tools/tunslip6.c
rename to tools/serial-io/tunslip6.c