Move all monitors into subdirs of their own

Each monitor module now resides in a subdirectory of its own.
The name of the subdirectory is the same as the name of the
library in the module's CMakeLists.txt file.

server/modules/CMakeLists.txt

@@ -1,4 +1,3 @@
-include_directories(monitor)
 add_subdirectory(routing)
 add_subdirectory(protocol)
 add_subdirectory(monitor)

server/modules/monitor/CMakeLists.txt

@@ -1,23 +1,4 @@
-add_library(mysqlmon SHARED mysql_mon.c)
-target_link_libraries(mysqlmon maxscale-common)
-add_dependencies(mysqlmon pcre2)
-set_target_properties(mysqlmon PROPERTIES VERSION "1.4.0")
-install_module(mysqlmon core)
-
-add_library(galeramon SHARED galeramon.c)
-target_link_libraries(galeramon maxscale-common)
-add_dependencies(galeramon pcre2)
-set_target_properties(galeramon PROPERTIES VERSION "2.0.0")
-install_module(galeramon core)
-
-add_library(ndbclustermon SHARED ndbclustermon.c)
-target_link_libraries(ndbclustermon maxscale-common)
-add_dependencies(ndbclustermon pcre2)
-set_target_properties(ndbclustermon PROPERTIES VERSION "2.1.0")
-install_module(ndbclustermon core)
-
-add_library(mmmon SHARED mmmon.c)
-target_link_libraries(mmmon maxscale-common)
-add_dependencies(mmmon pcre2)
-set_target_properties(mmmon PROPERTIES VERSION "1.1.1")
-install_module(mmmon core)
+add_subdirectory(galeramon)
+add_subdirectory(mmmon)
+add_subdirectory(mysqlmon)
+add_subdirectory(ndbclustermon)

server/modules/monitor/galeramon/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_library(galeramon SHARED galeramon.c)
+target_link_libraries(galeramon maxscale-common)
+add_dependencies(galeramon pcre2)
+set_target_properties(galeramon PROPERTIES VERSION "2.0.0")
+install_module(galeramon core)

server/modules/monitor/galeramon/galeramon.c

@@ -34,7 +34,7 @@
  */
 
 
-#include <galeramon.h>
+#include "galeramon.h"
 #include <dcb.h>
 #include <maxscale/alloc.h>
 

server/modules/monitor/mmmon/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_library(mmmon SHARED mmmon.c)
+target_link_libraries(mmmon maxscale-common)
+add_dependencies(mmmon pcre2)
+set_target_properties(mmmon PROPERTIES VERSION "1.1.1")
+install_module(mmmon core)

server/modules/monitor/mmmon/mmmon.c

@@ -25,7 +25,7 @@
  * @endverbatim
  */
 
-#include <mmmon.h>
+#include "mmmon.h"
 #include <dcb.h>
 #include <maxscale/alloc.h>
 

server/modules/monitor/mysqlmon/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_library(mysqlmon SHARED mysql_mon.c)
+target_link_libraries(mysqlmon maxscale-common)
+add_dependencies(mysqlmon pcre2)
+set_target_properties(mysqlmon PROPERTIES VERSION "1.4.0")
+install_module(mysqlmon core)

server/modules/monitor/mysqlmon/mysql_mon.c

@@ -45,7 +45,7 @@
  * @endverbatim
  */
 
-#include <mysqlmon.h>
+#include "../mysqlmon.h"
 #include <dcb.h>
 #include <modutil.h>
 #include <maxscale/alloc.h>

server/modules/monitor/ndbclustermon/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_library(ndbclustermon SHARED ndbclustermon.c)
+target_link_libraries(ndbclustermon maxscale-common)
+add_dependencies(ndbclustermon pcre2)
+set_target_properties(ndbclustermon PROPERTIES VERSION "2.1.0")
+install_module(ndbclustermon core)

server/modules/monitor/ndbclustermon/ndbclustermon.c

@@ -26,7 +26,7 @@
  */
 
 
-#include <mysqlmon.h>
+#include "../mysqlmon.h"
 #include <maxscale/alloc.h>
 
 static void monitorMain(void *);