From aa731eeaecbea1c44f52bc58a08deaff691ff450 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Thu, 31 Jul 2014 10:49:50 -0700
Subject: [PATCH] Final fixes, preparing for merge.

---
 src/CMakeLists.txt                            | 9 +++++----
 src/Val.cc                                    | 8 --------
 src/input/CMakeLists.txt                      | 1 +
 src/logging/CMakeLists.txt                    | 1 +
 src/logging/writers/dataseries/CMakeLists.txt | 7 +++++++
 src/logging/writers/dataseries/DataSeries.h   | 1 +
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2a272b467..04867b7189 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,16 +153,17 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
 set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE)
 set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE)
 
+add_subdirectory(analyzer)
+add_subdirectory(broxygen)
+add_subdirectory(file_analysis)
 add_subdirectory(input)
 add_subdirectory(logging)
-add_subdirectory(analyzer)
-add_subdirectory(file_analysis)
 add_subdirectory(probabilistic)
-add_subdirectory(broxygen)
 
 set(bro_SUBDIRS
-    ${bro_SUBDIR_LIBS}
+    # Order is important here.
     ${bro_PLUGIN_LIBS}
+    ${bro_SUBDIR_LIBS}
 )
 
 if ( NOT bro_HAVE_OBJECT_LIBRARIES )
diff --git a/src/Val.cc b/src/Val.cc
index ad7a920010..5f605a178e 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -2920,15 +2920,7 @@ void EnumVal::ValDescribe(ODesc* d) const
 	const char* ename = type->AsEnumType()->Lookup(val.int_val);
 
 	if ( ! ename )
-		{
-		EnumType::enum_name_list l = type->AsEnumType()->Names();
-
-		for ( EnumType::enum_name_list::const_iterator iter = l.begin();
-		      iter != l.end(); ++iter )
-			fprintf(stderr, "%s -> %lld\n", iter->first.c_str(), iter->second);
-
 		ename = "<undefined>";
-		}
 
 	d->Add(ename);
 	}
diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
index 6ef56cc65e..b1c79d2bd0 100644
--- a/src/input/CMakeLists.txt
+++ b/src/input/CMakeLists.txt
@@ -19,4 +19,5 @@ set(input_SRCS
 bif_target(input.bif)
 
 bro_add_subdir_library(input ${input_SRCS} ${BIF_OUTPUT_CC})
+add_dependencies(bro_input generate_outputs)
 
diff --git a/src/logging/CMakeLists.txt b/src/logging/CMakeLists.txt
index 24dbc9860b..f7ed586014 100644
--- a/src/logging/CMakeLists.txt
+++ b/src/logging/CMakeLists.txt
@@ -19,4 +19,5 @@ set(logging_SRCS
 bif_target(logging.bif)
 
 bro_add_subdir_library(logging ${logging_SRCS} ${BIF_OUTPUT_CC})
+add_dependencies(bro_logging generate_outputs)
 
diff --git a/src/logging/writers/dataseries/CMakeLists.txt b/src/logging/writers/dataseries/CMakeLists.txt
index 0917a092b0..f7f54e4c0f 100644
--- a/src/logging/writers/dataseries/CMakeLists.txt
+++ b/src/logging/writers/dataseries/CMakeLists.txt
@@ -10,9 +10,16 @@ if (NOT DISABLE_DATASERIES AND
 
     include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
+    include_directories(BEFORE ${Lintel_INCLUDE_DIR})
+    include_directories(BEFORE ${DataSeries_INCLUDE_DIR})
+    include_directories(BEFORE ${LibXML2_INCLUDE_DIR})
+
     bro_plugin_begin(Bro DataSeriesWriter)
     bro_plugin_cc(DataSeries.cc Plugin.cc)
     bro_plugin_bif(dataseries.bif)
+    bro_plugin_link_library(${Lintel_LIBRARIES})
+    bro_plugin_link_library(${DataSeries_LIBRARIES})
+    bro_plugin_link_library(${LibXML2_LIBRARIES})
     bro_plugin_end()
 
 endif()
diff --git a/src/logging/writers/dataseries/DataSeries.h b/src/logging/writers/dataseries/DataSeries.h
index 43ad60d291..cdc4d9a66c 100644
--- a/src/logging/writers/dataseries/DataSeries.h
+++ b/src/logging/writers/dataseries/DataSeries.h
@@ -12,6 +12,7 @@
 #include <DataSeries/GeneralField.hpp>
 
 #include "logging/WriterBackend.h"
+#include "threading/formatters/Ascii.h"
 
 namespace logging { namespace writer {