Moving src/protocols to src/analyzer/protocols.

This is for consistency with where readers/writers are located: inside
the subdirectories of the corresponding code.

src/CMakeLists.txt

@@ -162,7 +162,6 @@ binpac_target(modbus.pac
 set(bro_PLUGIN_OBJECT_LIBS CACHE INTERNAL "plugin object libraries" FORCE)
 
 add_subdirectory(analyzer)
-add_subdirectory(protocols)
 
 set(bro_SUBDIRS
     $<TARGET_OBJECTS:bro_analyzer>
@@ -392,7 +391,7 @@ set(bro_SRCS
     plugin/Manager.cc
     plugin/Plugin.cc
 
-    protocols/BuiltInAnalyzers.cc
+    analyzer/protocols/BuiltInAnalyzers.cc
 
     nb_dns.c
     digest.h

src/analyzer/CMakeLists.txt

@@ -4,6 +4,8 @@ include_directories(BEFORE
                     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+add_subdirectory(protocols)
+
 set(analyzer_SRCS
     Analyzer.cc
     Manager.cc

src/analyzer/protocols/BuiltInAnalyzers.cc

@@ -5,7 +5,7 @@
 #include "BuiltInAnalyzers.h"
 #include "analyzer/Component.h"
 
-#include "../binpac_bro.h"
+#include "../../binpac_bro.h"
 
 #include "AYIYA.h"
 #include "BackDoor.h"