src: Rename daemons and add tools folder

This renames the daemons to end with a 'd', as is common for UNIX
daemons. It also adds a tools folder, that will hold the tools of the
Ouroboros prototype. Examples are a simple echo application, an
application to instruct the IRM ...

11 files changed, 63 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6685dc2f..1ca05c95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,11 +46,13 @@ add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(tests)
 
+# We may have to move this to the subdirs
 include(MacroAddCompileFlags)
 if (CMAKE_BUILD_TYPE MATCHES Debug)
-   MACRO_ADD_COMPILE_FLAGS(ipcp -DCONFIG_OUROBOROS_DEBUG)
+   MACRO_ADD_COMPILE_FLAGS(ipcpd -DCONFIG_OUROBOROS_DEBUG)
+   MACRO_ADD_COMPILE_FLAGS(irmd -DCONFIG_OUROBOROS_DEBUG)
+   MACRO_ADD_COMPILE_FLAGS(dad -DCONFIG_OUROBOROS_DEBUG)
    MACRO_ADD_COMPILE_FLAGS(irm -DCONFIG_OUROBOROS_DEBUG)
-   MACRO_ADD_COMPILE_FLAGS(da -DCONFIG_OUROBOROS_DEBUG)
 endif (CMAKE_BUILD_TYPE MATCHES Debug)
 
 include(FeatureSummary)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca434d8a..b0732f08 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_subdirectory(ipcp)
-add_subdirectory(irm)
-add_subdirectory(da)
+add_subdirectory(ipcpd)
+add_subdirectory(irmd)
+add_subdirectory(dad)
 add_subdirectory(lib)
+add_subdirectory(tools)
diff --git a/src/da/CMakeLists.txt b/src/dad/CMakeLists.txt
index 050b0f80..3d4b8ea7 100644
--- a/src/da/CMakeLists.txt
+++ b/src/dad/CMakeLists.txt
@@ -9,8 +9,8 @@ set(SOURCE_FILES
         main.c
 )
 
-add_executable (da ${SOURCE_FILES})
+add_executable (dad ${SOURCE_FILES})
 
-target_link_libraries (da LINK_PUBLIC ouroboros)
+target_link_libraries (dad LINK_PUBLIC ouroboros)
 
-install(TARGETS da RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+install(TARGETS dad RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/src/da/main.c b/src/dad/main.c
index e2971dca..e2971dca 100644
--- a/src/da/main.c
+++ b/src/dad/main.c
diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
new file mode 100644
index 00000000..b16413cc
--- /dev/null
+++ b/src/ipcpd/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
+
+set(SOURCE_FILES
+        # Add source files here
+        main.c
+)
+
+add_executable (ipcpd ${SOURCE_FILES})
+
+target_link_libraries (ipcpd LINK_PUBLIC ouroboros)
+
+install(TARGETS ipcpd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/src/ipcp/main.c b/src/ipcpd/main.c
index b67b0af9..b67b0af9 100644
--- a/src/ipcp/main.c
+++ b/src/ipcpd/main.c
diff --git a/src/ipcp/CMakeLists.txt b/src/irmd/CMakeLists.txt
index 845f5b7b..bda793b7 100644
--- a/src/ipcp/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -9,8 +9,8 @@ set(SOURCE_FILES
         main.c
 )
 
-add_executable (ipcp ${SOURCE_FILES})
+add_executable (irmd ${SOURCE_FILES})
 
-target_link_libraries (ipcp LINK_PUBLIC ouroboros)
+target_link_libraries (irmd LINK_PUBLIC ouroboros)
 
-install(TARGETS ipcp RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/src/irm/main.c b/src/irmd/main.c
index 8ab071e0..8ab071e0 100644
--- a/src/irm/main.c
+++ b/src/irmd/main.c
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 00000000..6e00c17b
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(irm)
diff --git a/src/irm/CMakeLists.txt b/src/tools/irm/CMakeLists.txt
index 82c73e38..82c73e38 100644
--- a/src/irm/CMakeLists.txt
+++ b/src/tools/irm/CMakeLists.txt
diff --git a/src/tools/irm/main.c b/src/tools/irm/main.c
new file mode 100644
index 00000000..bad1000e
--- /dev/null
+++ b/src/tools/irm/main.c
@@ -0,0 +1,32 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * A tool to instruct the IRM
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define OUROBOROS_PREFIX "irm"
+
+#include <ouroboros/logs.h>
+
+int main () {
+
+        LOG_DBG("Test of the IRM tool");
+
+        return 0;
+}