From: Josh <jrosenba@cisco.com>
Date: Wed, 8 Oct 2014 17:09:00 +0000 (-0500)
Subject: make distcheck fixes
X-Git-Tag: 3.0.0-233~1383^2~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bbd8e040dd352e1df70b95ccc2a4268bd31f192;p=thirdparty%2Fsnort3.git

make distcheck fixes
---

diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 216530b72..c1702df18 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -9,6 +9,7 @@ set (FRAMEWORK_INCLUDES
     decode_data.h
     logger.h
     inspector.h
+    ips_action.h
     ips_option.h
     module.h
     mpse.h
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
index 45ce11030..9bba0836c 100644
--- a/src/framework/Makefile.am
+++ b/src/framework/Makefile.am
@@ -13,6 +13,7 @@ cursor.h \
 decode_data.h \
 logger.h \
 inspector.h \
+ips_action.h \
 ips_option.h \
 module.h \
 mpse.h \
diff --git a/src/main/policy.h b/src/main/policy.h
index dba484aeb..2d6421d60 100644
--- a/src/main/policy.h
+++ b/src/main/policy.h
@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+#include "main/snort_types.h"
+
 struct PortTable;
 struct vartable_t;
 struct sfip_var_t;
@@ -169,9 +171,10 @@ public:  // FIXTHIS-H make impl private
 //-------------------------------------------------------------------------
 
 // FIXIT-L may be inlined at some point; on lockdown for now
-NetworkPolicy* get_network_policy();
-InspectionPolicy* get_inspection_policy();
-IpsPolicy* get_ips_policy();
+// FIXIT-L SO_PUBLIC requierd because ScInlineMode(), etc. uses the function
+SO_PUBLIC NetworkPolicy* get_network_policy();
+SO_PUBLIC InspectionPolicy* get_inspection_policy();
+SO_PUBLIC IpsPolicy* get_ips_policy();
 
 void set_network_policy(NetworkPolicy*);
 void set_inspection_policy(InspectionPolicy*);
diff --git a/src/protocols/Makefile.am b/src/protocols/Makefile.am
index c6be1bfad..0eda8325a 100644
--- a/src/protocols/Makefile.am
+++ b/src/protocols/Makefile.am
@@ -16,6 +16,7 @@ ipv4_options.h \
 ipv6.h \
 gre.h \
 layer.h \
+linux_sll.h \
 mpls.h \
 packet.h \
 packet_manager.h \
diff --git a/src/stream/udp/CMakeLists.txt b/src/stream/udp/CMakeLists.txt
index e805766a7..ec736e937 100644
--- a/src/stream/udp/CMakeLists.txt
+++ b/src/stream/udp/CMakeLists.txt
@@ -5,6 +5,6 @@ add_library( stream_udp STATIC
     udp_module.cc
     udp_module.h
     udp_session.cc
-    udp_session.cc
+    udp_session.h
 )
 
diff --git a/src/stream/udp/Makefile.am b/src/stream/udp/Makefile.am
index 4c101599b..96b308870 100644
--- a/src/stream/udp/Makefile.am
+++ b/src/stream/udp/Makefile.am
@@ -8,7 +8,7 @@ stream_udp.h \
 udp_module.cc \
 udp_module.h \
 udp_session.cc \
-udp_session.cc
+udp_session.h
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
diff --git a/src/stream/udp/stream_udp.cc b/src/stream/udp/stream_udp.cc
index b4af05cb5..1b4dd44e0 100644
--- a/src/stream/udp/stream_udp.cc
+++ b/src/stream/udp/stream_udp.cc
@@ -27,7 +27,7 @@
 
 #include "stream_udp.h"
 #include "udp_module.h"
-#include "udp_session.h"
+#include "stream/udp/udp_session.h"
 #include "log/messages.h"
 #include "protocols/packet.h"
 
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index aaa77679c..c0da696dd 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -15,6 +15,7 @@ endif ( BUILD_SNPRINTF )
 set( UTIL_INCLUDES
     bitop.h
     bitop_funcs.h
+    dnet_header.h
     segment_mem.h
     sflsq.h
     sfmemcap.h
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 46019ebf0..e376f85bc 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -7,6 +7,7 @@ x_includedir = $(pkgincludedir)/utils
 x_include_HEADERS = \
 bitop.h \
 bitop_funcs.h \
+dnet_header.h \
 segment_mem.h \
 sflsq.h \
 sfmemcap.h \
diff --git a/tools/snort2lua/Makefile.am b/tools/snort2lua/Makefile.am
index 6264ceb61..14bbe4765 100644
--- a/tools/snort2lua/Makefile.am
+++ b/tools/snort2lua/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = snort2lua
 
 snort2lua_SOURCES = \
 conversion_state.h \
+conversion_defines.h \
 init_state.h \
 snort2lua.cc \
 init_state.cc