updating Makefile problem

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb74a353a4ed6c07352de36cb81df75666b5bf2d..1736275854c08332f8c6502a2f82cdaa616d6e99 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -210,13 +210,16 @@ endif
 if MAKE_HTML_DOC
 install-data-hook:
        mkdir -p $(DESTDIR)$(docdir)/snort_manual && \
-               tar zxvf $(srcdir)/snort_manual.tgz -C $(DESTDIR)$(docdir)/snort_manual
+               tar zxvf $(srcdir)/snort_manual.tgz && \
+               mv snort_manual.chunkd -C $(DESTDIR)$(docdir)/snort_manual
 
 else
 if HAVE_CHUNKED_DOC
 install-data-hook:
        mkdir -p $(DESTDIR)$(docdir)/snort_manual && \
-               tar zxvf $(srcdir)/snort_manual.tgz -C $(DESTDIR)$(docdir)/snort_manual
+               tar zxvf $(srcdir)/snort_manual.tgz  && \
+               mv snort_manual.chunkd -C $(DESTDIR)$(docdir)/snort_manual
+
 endif
 endif
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 8a6ebcd6806d1b979a8322666e4c5522634d0125..456c826ff090680cdbf09597a6d670fdbe52a22f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ codecs/libcodecs.a \
 codecs/ip/libip_codecs.a \
 codecs/misc/libmisc_codecs.a \
 ${codec_list} \
+codecs/libcodec_module.a \
 network_inspectors/libnetwork_inspectors.a \
 network_inspectors/binder/libbinder.a \
 network_inspectors/normalize/libnormalize.a \

diff --git a/src/codecs/Makefile.am b/src/codecs/Makefile.am
index 7567025d7d6d52da992131e5a00adbe53052a19d..f2e165872d1fca7d645fb57d5a33675da76535b5 100644 (file)
--- a/src/codecs/Makefile.am
+++ b/src/codecs/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
 
 x_includedir = $(pkgincludedir)/codecs
 
-noinst_LIBRARIES = libcodecs.a
+noinst_LIBRARIES = libcodecs.a libcodec_module.a
 
 x_include_HEADERS = \
 codec_events.h \
@@ -10,7 +10,9 @@ codec_module.h
 
 libcodecs_a_SOURCES = \
 codec_api.cc \
-codec_api.h \
+codec_api.h
+
+libcodec_module_a_SOURCES = \
 codec_module.cc
 
 

diff --git a/src/codecs/codec_module.h b/src/codecs/codec_module.h
index 19c960365588c0997eea5e9e5874856c45eb6313..7e4259f1047e0c5382348c9d481936dc49b6f136 100644 (file)
--- a/src/codecs/codec_module.h
+++ b/src/codecs/codec_module.h
@@ -33,7 +33,6 @@ constexpr int GID_DECODE = 116;
 
 enum CodecSid
 {
-
     DECODE_NOT_IPV4_DGRAM = 1,
     DECODE_IPV4_INVALID_HEADER_LEN = 2,
     DECODE_IPV4_DGRAM_LT_IPHDR = 3,
@@ -215,13 +214,13 @@ class CodecModule : public Module
 {
 public:
     CodecModule(const char* s, const char* h) : Module(s, h)
-    { };
+    { }
 
     CodecModule(const char* s, const char* h, const Parameter* p, bool is_list = false)
-    : Module(s, h, p, is_list) { };
+    : Module(s, h, p, is_list) { }
 
     unsigned get_gid() const override
-    { return GID_DECODE; };
+    { return GID_DECODE; }
 
     const RuleMap* get_rules() const override;
 };

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index b62e1ea8c2166f84a66662e07bdf7c4dec84c6ce..a1d1cb4fa69834eab46598aa0925ff9cbde69e2d 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -5,6 +5,13 @@ find_package(CHECK REQUIRED)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})  # for generated files
 include_directories(AFTER ${CHECK_INCLUDE_DIR})
 
+if ( LINUX )
+    find_library(LIBRT rt)
+
+    if ( NOT LIBRT )
+        message(FATAL_ERROR "librt required. Specicy it by user ")
+    endif()
+endif()
 
 #  Generating build_decl.h  Will rebuild every time 'make' is run
 add_custom_target(build_suit_decl ALL
@@ -40,6 +47,7 @@ add_library(unit_tests STATIC
 
 target_link_libraries(unit_tests
     ${CHECK_LIBRARIES}
+    ${LIBRT}
 )
 
 set_source_files_properties( unit_test.cc PROPERTIES