From 04625eeced0521bbfb660ac775effd382f85faae Mon Sep 17 00:00:00 2001 From: "Michael Altizer (mialtize)" Date: Fri, 13 Jan 2017 15:51:18 -0500 Subject: [PATCH] Merge pull request #774 in SNORT/snort3 from dynamic_plugins to master Squashed commit of the following: commit 429abf88893a45cdb4d2c4a8a5b41c18284cb166 Author: Michael Altizer Date: Thu Jan 12 18:28:03 2017 -0500 pkg-config: Remove unnecessary optional cppflags from the default Nothing in the exported headers requires PCAP, DNET, or OpenSSL headers. commit 482b74a103a5d6d88c1391e5c4219687cfeef875 Author: Michael Altizer Date: Thu Jan 12 18:24:06 2017 -0500 cmake: Fix exporting Hyperscan cppflags in snort.pc commit ab4ba847964e2d5e255e07663be9ab9fa35b5203 Author: Michael Altizer Date: Thu Jan 12 17:57:03 2017 -0500 cmake: Add configure_cmake.sh convenience wrapper for extras commit 1df401e0cc1ba3b60a10a74c041ae133407de7f7 Author: Michael Altizer Date: Thu Jan 12 17:49:11 2017 -0500 build: Synchronize installed files between autotools and cmake commit ebaf6fb2a8e05d50619dea337eb504996a3f7df6 Author: Michael Altizer Date: Wed Jan 11 02:33:18 2017 -0500 build: Build dynamic plugins as modules rather than shared libraries This removes the 'lib' prefix from dynamic plugins, leaving them with their normal bare names and a .so file extension. No SONAME nor other, OS-level dynamic library versioning method is applied. The cmake macro for adding dynamic plugins has been renamed from add_shared_library to add_dynamic_module. On OSX, this means that plugins will no longer have the dynamic library suffix (.dylib) and only plugins with the .so extension will be loaded, just like on other platforms. The cmake and automake templates for extras have been updated accordingly and used to regenerate the respective files in extras. commit 65cc51c527d07a3d1dfbc89c3ac9885f1c352984 Author: Michael Altizer Date: Thu Jan 12 14:00:55 2017 -0500 cmake: Fix setting CMAKE_C[XX]_FLAGS for subdirectories Don't clobber the existing CMAKE_C_FLAGS and CMAKE_CXX_FLAGS. Additionally, add subdirectories after flags have been pulled from pkg-config so that they are properly propagated. commit 8a1f748c6ab8836e6236c7b6922c42162138dd18 Author: Michael Altizer Date: Wed Jan 11 01:33:50 2017 -0500 build: Remove unnecessary check for pcap_lib_version() The function has been present since libpcap 0.8 and we require higher than that, so don't bother. --- cmake/create_pkg_config.cmake | 32 +- cmake/macros.cmake | 19 +- cmake/platforms.cmake | 26 +- cmake/sanity_checks.cmake | 2 - config.cmake.h.in | 3 - configure.ac | 16 - daqs/CMakeLists.txt | 10 +- extra/CMakeLists.txt | 8 +- extra/configure_cmake.sh | 100 +++++ extra/generate_boilerplate.sh | 2 +- extra/src/codecs/cd_eapol/CMakeLists.txt | 23 +- extra/src/codecs/cd_eapol/Makefile.am | 8 +- extra/src/codecs/cd_linux_sll/CMakeLists.txt | 23 +- extra/src/codecs/cd_linux_sll/Makefile.am | 8 +- extra/src/codecs/cd_null/CMakeLists.txt | 23 +- extra/src/codecs/cd_null/Makefile.am | 8 +- extra/src/codecs/cd_pflog/CMakeLists.txt | 23 +- extra/src/codecs/cd_pflog/Makefile.am | 8 +- extra/src/codecs/cd_pim/CMakeLists.txt | 23 +- extra/src/codecs/cd_pim/Makefile.am | 8 +- extra/src/codecs/cd_ppp/CMakeLists.txt | 23 +- extra/src/codecs/cd_ppp/Makefile.am | 8 +- extra/src/codecs/cd_raw4/CMakeLists.txt | 23 +- extra/src/codecs/cd_raw4/Makefile.am | 8 +- extra/src/codecs/cd_raw6/CMakeLists.txt | 23 +- extra/src/codecs/cd_raw6/Makefile.am | 8 +- extra/src/codecs/cd_slip/CMakeLists.txt | 23 +- extra/src/codecs/cd_slip/Makefile.am | 8 +- extra/src/codecs/cd_token_ring/CMakeLists.txt | 23 +- extra/src/codecs/cd_token_ring/Makefile.am | 8 +- extra/src/codecs/cd_wlan/CMakeLists.txt | 23 +- extra/src/codecs/cd_wlan/Makefile.am | 8 +- extra/src/daqs/daq_socket/CMakeLists.txt | 21 +- extra/src/daqs/daq_socket/Makefile.am | 9 +- extra/src/inspectors/data_log/CMakeLists.txt | 23 +- extra/src/inspectors/data_log/Makefile.am | 8 +- extra/src/inspectors/dpx/CMakeLists.txt | 23 +- extra/src/inspectors/dpx/Makefile.am | 8 +- .../src/inspectors/http_server/CMakeLists.txt | 49 ++- extra/src/inspectors/http_server/Makefile.am | 34 +- .../ips_options/ips_pkt_num/CMakeLists.txt | 23 +- extra/src/ips_options/ips_pkt_num/Makefile.am | 8 +- extra/src/ips_options/ips_urg/CMakeLists.txt | 23 +- extra/src/ips_options/ips_urg/Makefile.am | 8 +- extra/src/loggers/alert_ex/CMakeLists.txt | 23 +- extra/src/loggers/alert_ex/Makefile.am | 8 +- .../src/loggers/alert_unixsock/CMakeLists.txt | 23 +- extra/src/loggers/alert_unixsock/Makefile.am | 8 +- extra/src/loggers/log_null/CMakeLists.txt | 23 +- extra/src/loggers/log_null/Makefile.am | 8 +- .../src/search_engines/lowmem/CMakeLists.txt | 23 +- extra/src/search_engines/lowmem/Makefile.am | 8 +- extra/src/so_rules/sid_18758/CMakeLists.txt | 23 +- extra/src/so_rules/sid_18758/Makefile.am | 8 +- extra/templates/CMakeLists.txt.erb | 36 +- extra/templates/Makefile.am.erb | 13 +- snort.pc.in | 4 +- src/actions/CMakeLists.txt | 4 +- src/actions/Makefile.am | 18 +- src/codecs/ip/CMakeLists.txt | 38 +- src/codecs/ip/Makefile.am | 158 ++++---- src/codecs/link/CMakeLists.txt | 20 +- src/codecs/link/Makefile.am | 80 ++-- src/codecs/misc/CMakeLists.txt | 12 +- src/codecs/misc/Makefile.am | 58 +-- src/codecs/root/CMakeLists.txt | 2 +- src/codecs/root/Makefile.am | 8 +- src/detection/CMakeLists.txt | 2 +- src/file_api/CMakeLists.txt | 3 - src/flow/CMakeLists.txt | 4 +- src/ips_options/CMakeLists.txt | 82 ++-- src/ips_options/Makefile.am | 378 +++++++++--------- src/loggers/CMakeLists.txt | 14 +- src/loggers/Makefile.am | 68 ++-- src/lua/Makefile.am | 23 +- src/managers/plugin_manager.cc | 4 - src/network_inspectors/appid/CMakeLists.txt | 2 +- src/network_inspectors/appid/Makefile.am | 8 +- .../arp_spoof/CMakeLists.txt | 2 +- src/network_inspectors/arp_spoof/Makefile.am | 8 +- src/network_inspectors/binder/CMakeLists.txt | 2 +- src/network_inspectors/binder/Makefile.am | 8 +- .../packet_capture/CMakeLists.txt | 2 +- .../packet_capture/Makefile.am | 8 +- src/network_inspectors/port_scan/Makefile.am | 8 +- src/search_engines/CMakeLists.txt | 4 +- src/search_engines/Makefile.am | 16 +- .../back_orifice/CMakeLists.txt | 2 +- .../back_orifice/Makefile.am | 8 +- src/service_inspectors/dce_rpc/CMakeLists.txt | 2 +- src/service_inspectors/dce_rpc/Makefile.am | 8 +- src/service_inspectors/dnp3/CMakeLists.txt | 2 +- src/service_inspectors/dnp3/Makefile.am | 8 +- src/service_inspectors/dns/CMakeLists.txt | 2 +- src/service_inspectors/dns/Makefile.am | 8 +- .../ftp_telnet/CMakeLists.txt | 2 +- src/service_inspectors/ftp_telnet/Makefile.am | 8 +- src/service_inspectors/gtp/CMakeLists.txt | 2 +- src/service_inspectors/gtp/Makefile.am | 8 +- .../http_inspect/CMakeLists.txt | 2 +- .../http_inspect/Makefile.am | 8 +- src/service_inspectors/imap/CMakeLists.txt | 2 +- src/service_inspectors/imap/Makefile.am | 8 +- src/service_inspectors/modbus/CMakeLists.txt | 2 +- src/service_inspectors/modbus/Makefile.am | 8 +- src/service_inspectors/pop/CMakeLists.txt | 2 +- src/service_inspectors/pop/Makefile.am | 8 +- .../rpc_decode/CMakeLists.txt | 2 +- src/service_inspectors/rpc_decode/Makefile.am | 8 +- src/service_inspectors/sip/CMakeLists.txt | 2 +- src/service_inspectors/sip/Makefile.am | 8 +- src/service_inspectors/smtp/CMakeLists.txt | 2 +- src/service_inspectors/smtp/Makefile.am | 8 +- src/service_inspectors/ssh/CMakeLists.txt | 2 +- src/service_inspectors/ssh/Makefile.am | 8 +- src/service_inspectors/ssl/CMakeLists.txt | 2 +- src/service_inspectors/ssl/Makefile.am | 2 +- src/service_inspectors/wizard/CMakeLists.txt | 2 +- src/service_inspectors/wizard/Makefile.am | 8 +- src/utils/util.cc | 2 - 120 files changed, 1225 insertions(+), 979 deletions(-) create mode 100755 extra/configure_cmake.sh diff --git a/cmake/create_pkg_config.cmake b/cmake/create_pkg_config.cmake index 6b0ac3c4f..0ed45ca56 100644 --- a/cmake/create_pkg_config.cmake +++ b/cmake/create_pkg_config.cmake @@ -12,28 +12,28 @@ set(datadir "\${datarootdir}") set(mandir "\${datarootdir}/man") set(infodir "\${datarootdir}/info") -if(PCAP_INCLUDE_DIR) - set(PCAP_CPPFLAGS "-I${PCAP_INCLUDE_DIR}") +if(DAQ_INCLUDE_DIR) + set(DAQ_CPPFLAGS "-I${DAQ_INCLUDE_DIR}") endif() -if(HWLOC_INCLUDE_DIR) - set(HWLOC_CPPFLAGS "-I${HWLOC_INCLUDE_DIR}") +if(DNET_INCLUDE_DIR) + set(DNET_CPPFLAGS "-I${DNET_INCLUDE_DIR}") endif() -if(LUAJIT_INCLUDE_DIR) - set(LUAJIT_CPPFLAGS "-I${LUAJIT_INCLUDE_DIR}") +if(HS_INCLUDE_DIR) + set(HYPERSCAN_CPPFLAGS "-I${HS_INCLUDE_DIR}") endif() -if(PCRE_INCLUDE_DIR) - set(PCRE_CPPFLAGS "-I${PCRE_INCLUDE_DIR}") +if(HWLOC_INCLUDE_DIR) + set(HWLOC_CPPFLAGS "-I${HWLOC_INCLUDE_DIR}") endif() -if(DNET_INCLUDE_DIR) - set(DNET_CPPFLAGS "-I${DNET_INCLUDE_DIR}") +if(INTEL_SOFT_CPM_INCLUDE_DIR) + set(INTEL_SOFT_CPM_CPPFLAGS "-I${INTEL_SOFT_CPM_INCLUDE_DIR}") endif() -if(DAQ_INCLUDE_DIR) - set(DAQ_CPPFLAGS "-I${DAQ_INCLUDE_DIR}") +if(LUAJIT_INCLUDE_DIR) + set(LUAJIT_CPPFLAGS "-I${LUAJIT_INCLUDE_DIR}") endif() if(LZMA_INCLUDE_DIR) @@ -44,12 +44,12 @@ if(OPENSSL_INCLUDE_DIR) set(OPENSSL_CPPFLAGS "-I${OPENSSL_INCLUDE_DIR}") endif() -if(INTEL_SOFT_CPM_INCLUDE_DIR) - set(INTEL_SOFT_CPM_CPPFLAGS "-I${INTEL_SOFT_CPM_INCLUDE_DIR}") +if(PCAP_INCLUDE_DIR) + set(PCAP_CPPFLAGS "-I${PCAP_INCLUDE_DIR}") endif() -if(HYPERSCAN_INCLUDE_DIR) - set(HYPERSCAN_CPPFLAGS "-I${HYPERSCAN_INCLUDE_DIR}") +if(PCRE_INCLUDE_DIR) + set(PCRE_CPPFLAGS "-I${PCRE_INCLUDE_DIR}") endif() # create & install pkgconfig file diff --git a/cmake/macros.cmake b/cmake/macros.cmake index f6fcedb16..6a7358a00 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -1,23 +1,32 @@ # TO CALL THIS MACRO... # PARAMS: -# libname : The library's libname -# additional args : the library's sources. Must have at least one source -macro (add_shared_library libname install_path) +# libname : The module's name +# additional args : the module's sources. Must have at least one source +macro (add_dynamic_module libname install_path) set (sources ${ARGN}) - add_library ( ${libname} SHARED ${sources} ) + add_library ( ${libname} MODULE ${sources} ) set_target_properties ( ${libname} PROPERTIES COMPILE_FLAGS "-DBUILDING_SO" + PREFIX "" ) + if (APPLE) + set_target_properties ( + ${libname} + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) + endif() + install ( TARGETS ${libname} LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/${install_path}" ) -endmacro (add_shared_library) +endmacro (add_dynamic_module) #anything following testname is assumed to be a link dependency diff --git a/cmake/platforms.cmake b/cmake/platforms.cmake index 172c6944d..c780f55da 100644 --- a/cmake/platforms.cmake +++ b/cmake/platforms.cmake @@ -18,6 +18,7 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") endif() endif() + # the Clang compiler on MacOS X may need the c++ library explicityly specified if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -29,31 +30,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() endif() -include(CheckCXXCompilerFlag) - -# More MacOS X fun -set(CMAKE_REQUIRED_FLAGS "-Wl,-undefined,dynamic_lookup") -check_cxx_compiler_flag(${CMAKE_REQUIRED_FLAGS} HAVE_DYNAMIC_LOOKUP) -if(HAVE_DYNAMIC_LOOKUP) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}") -endif() -unset (CMAKE_REQUIRED_FLAGS) - - -#set (CMAKE_REQUIRED_FLAGS "-Wl,-export-dynamic") -#check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_EXPORT_DYNAMIC) -#if (HAVE_EXPORT_DYNAMIC) -# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}") -#endif () -#unset(CMAKE_REQUIRED_FLAGS) - -#set (CMAKE_REQUIRED_FLAGS "-Wl,-shared") -#check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_SHARED) -#if (HAVE_SHARED) -# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}") -#endif () -#unset(CMAKE_REQUIRED_FLAGS) +include(CheckCXXCompilerFlag) set (CMAKE_REQUIRED_FLAGS "-fvisibility=hidden") check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_VISIBILITY) diff --git a/cmake/sanity_checks.cmake b/cmake/sanity_checks.cmake index 8da44ba96..b0567d1fb 100644 --- a/cmake/sanity_checks.cmake +++ b/cmake/sanity_checks.cmake @@ -183,5 +183,3 @@ endif() if (DEFINED LIBLZMA_LIBRARIES) check_library_exists (${LIBLZMA_LIBRARIES} lzma_code "" HAVE_LZMA) endif() - -check_library_exists (pcap pcap_lib_version "${PCAP_LIBRARIES}" HAVE_PCAP_LIB_VERSION) diff --git a/config.cmake.h.in b/config.cmake.h.in index 9909c5ae7..462173980 100644 --- a/config.cmake.h.in +++ b/config.cmake.h.in @@ -239,9 +239,6 @@ /* Library specific functions */ -/* Can output the library version. */ -#cmakedefine HAVE_PCAP_LIB_VERSION 1 - /* Available compiler options */ diff --git a/configure.ac b/configure.ac index dcd8d7cc7..03068c1a6 100644 --- a/configure.ac +++ b/configure.ac @@ -606,22 +606,6 @@ if test "x$LPCAP" = "xno"; then exit 1 fi -AC_MSG_CHECKING([for pcap_lib_version]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[pcap_lib_version();]] - )], - [have_pcap_lib_version="yes"], - [have_pcap_lib_version="no"] -) -AC_MSG_RESULT($have_pcap_lib_version) - -if test "x$have_pcap_lib_version" = "xyes"; then - AC_DEFINE([HAVE_PCAP_LIB_VERSION],[1], - [Can output the library version.]) -fi - #-------------------------------------------------------------------------- # hwloc #-------------------------------------------------------------------------- diff --git a/daqs/CMakeLists.txt b/daqs/CMakeLists.txt index 4a21b91d0..8556d7113 100644 --- a/daqs/CMakeLists.txt +++ b/daqs/CMakeLists.txt @@ -1,18 +1,10 @@ macro ( add_daq_module libname ) - set ( sources ${ARGN} ) - add_library ( ${libname} MODULE ${sources} ) + add_dynamic_module ( ${libname} daqs ${ARGN} ) set_target_properties ( ${libname} PROPERTIES - COMPILE_FLAGS "-DBUILDING_SO" C_STANDARD 99 ) - - install ( - TARGETS ${libname} - LIBRARY - DESTINATION "lib/${CMAKE_PROJECT_NAME}/daqs" - ) endmacro ( add_daq_module ) set ( DAQS_INCLUDES daq_user.h ) diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 206c0923c..5a6ad907f 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required ( VERSION 2.8.11 ) project( snort_extra CXX C ) -add_subdirectory ( src ) - set (EXTRA_VERSION_MAJOR 1) set (EXTRA_VERSION_MINOR 0) set (EXTRA_VERSION_BUILD 0-a4) @@ -28,8 +26,8 @@ include(CPack) set ( C_FLAGS "" CACHE STRING "" ) set ( CXX_FLAGS "" CACHE STRING "" ) -set ( CMAKE_C_FLAGS "${C_FLAGS}" CACHE STRING "" FORCE ) -set ( CMAKE_CXX_FLAGS "${CXX_FLAGS}" CACHE STRING "" FORCE ) +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS}" CACHE STRING "" FORCE ) +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS}" CACHE STRING "" FORCE ) execute_process ( COMMAND pkg-config --variable=cpp_opts snort @@ -67,3 +65,5 @@ foreach ( OPT ${CPP_OPTS_OTHER} ) string ( REGEX REPLACE "[\r\n]" " " CPPFLAGS "${CPPFLAGS}" ) set ( ${OPT}_CPPFLAGS "${CPPFLAGS}" CACHE STRING "" ) endforeach ( OPT ) + +add_subdirectory ( src ) diff --git a/extra/configure_cmake.sh b/extra/configure_cmake.sh new file mode 100755 index 000000000..9e6fed565 --- /dev/null +++ b/extra/configure_cmake.sh @@ -0,0 +1,100 @@ +#!/bin/sh +# Convenience wrapper for easily viewing/setting options that +# the project's CMake scripts will recognize + +set -e +command="$0 $*" + +# check for `cmake` command +type cmake > /dev/null 2>&1 || { + echo "\ +This package requires CMake, please install it first, then you may +use this configure script to access CMake equivalent functionality.\ +" >&2; + exit 1; +} + +usage="\ +Usage: $0 [OPTION]... [VAR=VALUE]... + + --builddir= The build directory + --generator= run cmake --help for a list of generators + --prefix= Snort++ installation prefix +" + +sourcedir="$( cd "$( dirname "$0" )" && pwd )" + +# Function to append a CMake cache entry definition to the +# CMakeCacheEntries variable +# $1 is the cache entry variable name +# $2 is the cache entry variable type +# $3 is the cache entry variable value +append_cache_entry () { + CMakeCacheEntries="$CMakeCacheEntries -D $1:$2=$3" +} + +# set defaults +builddir=build +prefix=/usr/local/snort +CMakeCacheEntries="" +append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix + + +# parse arguments +while [ $# -ne 0 ]; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case "$1" in + --help|-h) + echo "${usage}" 1>&2 + exit 1 + ;; + --builddir=*) + builddir=$optarg + ;; + --generator=*) + CMakeGenerator="$optarg" + ;; + --prefix=*) + prefix=$optarg + append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg + ;; + *) + echo "Invalid option '$1'. Try $0 --help to see available options." + exit 1 + ;; + esac + shift +done + +if [ -d $builddir ]; then + # If build directory exists, check if it has a CMake cache + if [ -f $builddir/CMakeCache.txt ]; then + # If the CMake cache exists, delete it so that this configuration + # is not tainted by a previous one + rm -f $builddir/CMakeCache.txt + fi +else + # Create build directory + mkdir -p $builddir +fi + +echo "Build Directory : $builddir" +echo "Source Directory: $sourcedir" +cd $builddir + +gen="" +[ "$CMakeGenerator" ] && gen+=" -G $CMakeGenerator" + +cmake $gen \ + -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS $CPPFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$CFLAGS $CPPFLAGS" \ + $CMakeCacheEntries $sourcedir + +echo "# This is the command used to configure this build" > config.status +echo $command >> config.status +chmod u+x config.status + diff --git a/extra/generate_boilerplate.sh b/extra/generate_boilerplate.sh index 71764b38d..4729c5d8d 100755 --- a/extra/generate_boilerplate.sh +++ b/extra/generate_boilerplate.sh @@ -20,7 +20,7 @@ boilerplate=( [[ -n $DRY_RUN ]] && ECHO=echo || ECHO= -for project_dir in $(find $RECURSE -type d -mindepth 3); do +for project_dir in $(find $RECURSE -mindepth 3 -type d); do project_base=${project_dir##*/} for template in "${boilerplate[@]}"; do diff --git a/extra/src/codecs/cd_eapol/CMakeLists.txt b/extra/src/codecs/cd_eapol/CMakeLists.txt index 513bd91b5..0d7316718 100644 --- a/extra/src/codecs/cd_eapol/CMakeLists.txt +++ b/extra/src/codecs/cd_eapol/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_eapol CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_eapol SHARED + cd_eapol MODULE cd_eapol.cc ) +if ( APPLE ) + set_target_properties ( + cd_eapol + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_eapol + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_eapol - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_eapol/Makefile.am b/extra/src/codecs/cd_eapol/Makefile.am index aa93f9a54..2990eb365 100644 --- a/extra/src/codecs/cd_eapol/Makefile.am +++ b/extra/src/codecs/cd_eapol/Makefile.am @@ -2,7 +2,7 @@ cd_eapollibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_eapollib_LTLIBRARIES = libcd_eapol.la -libcd_eapol_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_eapol_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_eapol_la_SOURCES = cd_eapol.cc +cd_eapollib_LTLIBRARIES = cd_eapol.la +cd_eapol_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_eapol_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_eapol_la_SOURCES = cd_eapol.cc diff --git a/extra/src/codecs/cd_linux_sll/CMakeLists.txt b/extra/src/codecs/cd_linux_sll/CMakeLists.txt index ab21c5ab6..bfa2b7756 100644 --- a/extra/src/codecs/cd_linux_sll/CMakeLists.txt +++ b/extra/src/codecs/cd_linux_sll/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_linux_sll CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_linux_sll SHARED + cd_linux_sll MODULE cd_linux_sll.cc ) +if ( APPLE ) + set_target_properties ( + cd_linux_sll + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_linux_sll + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_linux_sll - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_linux_sll/Makefile.am b/extra/src/codecs/cd_linux_sll/Makefile.am index 149b5f262..94dedd16b 100644 --- a/extra/src/codecs/cd_linux_sll/Makefile.am +++ b/extra/src/codecs/cd_linux_sll/Makefile.am @@ -2,7 +2,7 @@ cd_linux_slllibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_linux_slllib_LTLIBRARIES = libcd_linux_sll.la -libcd_linux_sll_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_linux_sll_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_linux_sll_la_SOURCES = cd_linux_sll.cc +cd_linux_slllib_LTLIBRARIES = cd_linux_sll.la +cd_linux_sll_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_linux_sll_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_linux_sll_la_SOURCES = cd_linux_sll.cc diff --git a/extra/src/codecs/cd_null/CMakeLists.txt b/extra/src/codecs/cd_null/CMakeLists.txt index 77bae9a9c..46149520f 100644 --- a/extra/src/codecs/cd_null/CMakeLists.txt +++ b/extra/src/codecs/cd_null/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_null CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_null SHARED + cd_null MODULE cd_null.cc ) +if ( APPLE ) + set_target_properties ( + cd_null + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_null + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_null - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_null/Makefile.am b/extra/src/codecs/cd_null/Makefile.am index f798fb6da..b0d8f6dc0 100644 --- a/extra/src/codecs/cd_null/Makefile.am +++ b/extra/src/codecs/cd_null/Makefile.am @@ -2,7 +2,7 @@ cd_nulllibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_nulllib_LTLIBRARIES = libcd_null.la -libcd_null_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_null_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_null_la_SOURCES = cd_null.cc +cd_nulllib_LTLIBRARIES = cd_null.la +cd_null_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_null_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_null_la_SOURCES = cd_null.cc diff --git a/extra/src/codecs/cd_pflog/CMakeLists.txt b/extra/src/codecs/cd_pflog/CMakeLists.txt index 78be17c3f..f69de5785 100644 --- a/extra/src/codecs/cd_pflog/CMakeLists.txt +++ b/extra/src/codecs/cd_pflog/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_pflog CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_pflog SHARED + cd_pflog MODULE cd_pflog.cc ) +if ( APPLE ) + set_target_properties ( + cd_pflog + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_pflog + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_pflog - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_pflog/Makefile.am b/extra/src/codecs/cd_pflog/Makefile.am index a8d348a4b..8ab8449e2 100644 --- a/extra/src/codecs/cd_pflog/Makefile.am +++ b/extra/src/codecs/cd_pflog/Makefile.am @@ -2,7 +2,7 @@ cd_pfloglibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_pfloglib_LTLIBRARIES = libcd_pflog.la -libcd_pflog_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_pflog_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_pflog_la_SOURCES = cd_pflog.cc +cd_pfloglib_LTLIBRARIES = cd_pflog.la +cd_pflog_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_pflog_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_pflog_la_SOURCES = cd_pflog.cc diff --git a/extra/src/codecs/cd_pim/CMakeLists.txt b/extra/src/codecs/cd_pim/CMakeLists.txt index 43b9d6a19..b7f6107b1 100644 --- a/extra/src/codecs/cd_pim/CMakeLists.txt +++ b/extra/src/codecs/cd_pim/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_pim CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_pim SHARED + cd_pim MODULE cd_pim.cc ) +if ( APPLE ) + set_target_properties ( + cd_pim + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_pim + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_pim - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_pim/Makefile.am b/extra/src/codecs/cd_pim/Makefile.am index 1ce339ec3..24a1352b5 100644 --- a/extra/src/codecs/cd_pim/Makefile.am +++ b/extra/src/codecs/cd_pim/Makefile.am @@ -2,7 +2,7 @@ cd_pimlibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_pimlib_LTLIBRARIES = libcd_pim.la -libcd_pim_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_pim_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_pim_la_SOURCES = cd_pim.cc +cd_pimlib_LTLIBRARIES = cd_pim.la +cd_pim_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_pim_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_pim_la_SOURCES = cd_pim.cc diff --git a/extra/src/codecs/cd_ppp/CMakeLists.txt b/extra/src/codecs/cd_ppp/CMakeLists.txt index df9dc1a1c..25769040e 100644 --- a/extra/src/codecs/cd_ppp/CMakeLists.txt +++ b/extra/src/codecs/cd_ppp/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_ppp CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_ppp SHARED + cd_ppp MODULE cd_ppp.cc ) +if ( APPLE ) + set_target_properties ( + cd_ppp + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_ppp + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_ppp - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_ppp/Makefile.am b/extra/src/codecs/cd_ppp/Makefile.am index d50a1fb25..66609f318 100644 --- a/extra/src/codecs/cd_ppp/Makefile.am +++ b/extra/src/codecs/cd_ppp/Makefile.am @@ -2,7 +2,7 @@ cd_ppplibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_ppplib_LTLIBRARIES = libcd_ppp.la -libcd_ppp_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_ppp_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_ppp_la_SOURCES = cd_ppp.cc +cd_ppplib_LTLIBRARIES = cd_ppp.la +cd_ppp_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_ppp_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_ppp_la_SOURCES = cd_ppp.cc diff --git a/extra/src/codecs/cd_raw4/CMakeLists.txt b/extra/src/codecs/cd_raw4/CMakeLists.txt index ca2b445eb..d3b89bd74 100644 --- a/extra/src/codecs/cd_raw4/CMakeLists.txt +++ b/extra/src/codecs/cd_raw4/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_raw4 CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_raw4 SHARED + cd_raw4 MODULE cd_raw4.cc ) +if ( APPLE ) + set_target_properties ( + cd_raw4 + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_raw4 + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_raw4 - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_raw4/Makefile.am b/extra/src/codecs/cd_raw4/Makefile.am index a26e5ae1d..3822fac36 100644 --- a/extra/src/codecs/cd_raw4/Makefile.am +++ b/extra/src/codecs/cd_raw4/Makefile.am @@ -2,7 +2,7 @@ cd_raw4libdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_raw4lib_LTLIBRARIES = libcd_raw4.la -libcd_raw4_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_raw4_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_raw4_la_SOURCES = cd_raw4.cc +cd_raw4lib_LTLIBRARIES = cd_raw4.la +cd_raw4_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_raw4_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_raw4_la_SOURCES = cd_raw4.cc diff --git a/extra/src/codecs/cd_raw6/CMakeLists.txt b/extra/src/codecs/cd_raw6/CMakeLists.txt index 3671efab0..2ac08a8ca 100644 --- a/extra/src/codecs/cd_raw6/CMakeLists.txt +++ b/extra/src/codecs/cd_raw6/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_raw6 CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_raw6 SHARED + cd_raw6 MODULE cd_raw6.cc ) +if ( APPLE ) + set_target_properties ( + cd_raw6 + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_raw6 + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_raw6 - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_raw6/Makefile.am b/extra/src/codecs/cd_raw6/Makefile.am index 4cb20fdf0..a95053dbb 100644 --- a/extra/src/codecs/cd_raw6/Makefile.am +++ b/extra/src/codecs/cd_raw6/Makefile.am @@ -2,7 +2,7 @@ cd_raw6libdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_raw6lib_LTLIBRARIES = libcd_raw6.la -libcd_raw6_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_raw6_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_raw6_la_SOURCES = cd_raw6.cc +cd_raw6lib_LTLIBRARIES = cd_raw6.la +cd_raw6_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_raw6_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_raw6_la_SOURCES = cd_raw6.cc diff --git a/extra/src/codecs/cd_slip/CMakeLists.txt b/extra/src/codecs/cd_slip/CMakeLists.txt index ca9689776..015d00fd3 100644 --- a/extra/src/codecs/cd_slip/CMakeLists.txt +++ b/extra/src/codecs/cd_slip/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_slip CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_slip SHARED + cd_slip MODULE cd_slip.cc ) +if ( APPLE ) + set_target_properties ( + cd_slip + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_slip + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_slip - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_slip/Makefile.am b/extra/src/codecs/cd_slip/Makefile.am index 934d0674b..44f29c154 100644 --- a/extra/src/codecs/cd_slip/Makefile.am +++ b/extra/src/codecs/cd_slip/Makefile.am @@ -2,7 +2,7 @@ cd_sliplibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_sliplib_LTLIBRARIES = libcd_slip.la -libcd_slip_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_slip_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_slip_la_SOURCES = cd_slip.cc +cd_sliplib_LTLIBRARIES = cd_slip.la +cd_slip_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_slip_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_slip_la_SOURCES = cd_slip.cc diff --git a/extra/src/codecs/cd_token_ring/CMakeLists.txt b/extra/src/codecs/cd_token_ring/CMakeLists.txt index e514961ea..78552ee89 100644 --- a/extra/src/codecs/cd_token_ring/CMakeLists.txt +++ b/extra/src/codecs/cd_token_ring/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_token_ring CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_token_ring SHARED + cd_token_ring MODULE cd_token_ring.cc ) +if ( APPLE ) + set_target_properties ( + cd_token_ring + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_token_ring + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_token_ring - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_token_ring/Makefile.am b/extra/src/codecs/cd_token_ring/Makefile.am index e1b85b622..08775930d 100644 --- a/extra/src/codecs/cd_token_ring/Makefile.am +++ b/extra/src/codecs/cd_token_ring/Makefile.am @@ -2,7 +2,7 @@ cd_token_ringlibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_token_ringlib_LTLIBRARIES = libcd_token_ring.la -libcd_token_ring_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_token_ring_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_token_ring_la_SOURCES = cd_token_ring.cc +cd_token_ringlib_LTLIBRARIES = cd_token_ring.la +cd_token_ring_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_token_ring_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_token_ring_la_SOURCES = cd_token_ring.cc diff --git a/extra/src/codecs/cd_wlan/CMakeLists.txt b/extra/src/codecs/cd_wlan/CMakeLists.txt index b2c73ff00..2e521da2b 100644 --- a/extra/src/codecs/cd_wlan/CMakeLists.txt +++ b/extra/src/codecs/cd_wlan/CMakeLists.txt @@ -3,20 +3,30 @@ project ( cd_wlan CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - cd_wlan SHARED + cd_wlan MODULE cd_wlan.cc ) +if ( APPLE ) + set_target_properties ( + cd_wlan + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + cd_wlan + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS cd_wlan - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/codecs" ) diff --git a/extra/src/codecs/cd_wlan/Makefile.am b/extra/src/codecs/cd_wlan/Makefile.am index 47f91b521..e3e6c53ed 100644 --- a/extra/src/codecs/cd_wlan/Makefile.am +++ b/extra/src/codecs/cd_wlan/Makefile.am @@ -2,7 +2,7 @@ cd_wlanlibdir = $(pkglibdir)/codecs AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -cd_wlanlib_LTLIBRARIES = libcd_wlan.la -libcd_wlan_la_CXXFLAGS = $(AM_CXXFLAGS) -libcd_wlan_la_LDFLAGS = -export-dynamic -shared -avoid-version -libcd_wlan_la_SOURCES = cd_wlan.cc +cd_wlanlib_LTLIBRARIES = cd_wlan.la +cd_wlan_la_CXXFLAGS = $(AM_CXXFLAGS) +cd_wlan_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +cd_wlan_la_SOURCES = cd_wlan.cc diff --git a/extra/src/daqs/daq_socket/CMakeLists.txt b/extra/src/daqs/daq_socket/CMakeLists.txt index ad4feff54..f8eaa2605 100644 --- a/extra/src/daqs/daq_socket/CMakeLists.txt +++ b/extra/src/daqs/daq_socket/CMakeLists.txt @@ -3,10 +3,6 @@ project ( daq_socket C ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) @@ -17,6 +13,20 @@ add_library ( daq_socket.c ) +if ( APPLE ) + set_target_properties ( + daq_socket + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + daq_socket + PROPERTIES + PREFIX "" +) + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS daq_socket - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/daqs" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/daqs" ) diff --git a/extra/src/daqs/daq_socket/Makefile.am b/extra/src/daqs/daq_socket/Makefile.am index c188f586c..4ced90230 100644 --- a/extra/src/daqs/daq_socket/Makefile.am +++ b/extra/src/daqs/daq_socket/Makefile.am @@ -2,8 +2,7 @@ daq_socketlibdir = $(pkglibdir)/daqs AM_CFLAGS = @SNORT3_CFLAGS@ -std=gnu99 -daq_socketlib_LTLIBRARIES = libdaq_socket.la -libdaq_socket_la_CFLAGS = $(AM_CFLAGS) -libdaq_socket_la_LDFLAGS = -export-dynamic -shared -avoid-version -libdaq_socket_la_LDFLAGS += -module -libdaq_socket_la_SOURCES = daq_socket.c +daq_socketlib_LTLIBRARIES = daq_socket.la +daq_socket_la_CFLAGS = $(AM_CFLAGS) +daq_socket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +daq_socket_la_SOURCES = daq_socket.c diff --git a/extra/src/inspectors/data_log/CMakeLists.txt b/extra/src/inspectors/data_log/CMakeLists.txt index e1c1fe186..15d732a55 100644 --- a/extra/src/inspectors/data_log/CMakeLists.txt +++ b/extra/src/inspectors/data_log/CMakeLists.txt @@ -3,20 +3,30 @@ project ( data_log CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - data_log SHARED + data_log MODULE data_log.cc ) +if ( APPLE ) + set_target_properties ( + data_log + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + data_log + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS data_log - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" ) diff --git a/extra/src/inspectors/data_log/Makefile.am b/extra/src/inspectors/data_log/Makefile.am index 1c72940e5..11eba96c1 100644 --- a/extra/src/inspectors/data_log/Makefile.am +++ b/extra/src/inspectors/data_log/Makefile.am @@ -2,7 +2,7 @@ data_loglibdir = $(pkglibdir)/inspectors AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -data_loglib_LTLIBRARIES = libdata_log.la -libdata_log_la_CXXFLAGS = $(AM_CXXFLAGS) -libdata_log_la_LDFLAGS = -export-dynamic -shared -avoid-version -libdata_log_la_SOURCES = data_log.cc +data_loglib_LTLIBRARIES = data_log.la +data_log_la_CXXFLAGS = $(AM_CXXFLAGS) +data_log_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +data_log_la_SOURCES = data_log.cc diff --git a/extra/src/inspectors/dpx/CMakeLists.txt b/extra/src/inspectors/dpx/CMakeLists.txt index 8408a05f1..5b6e1fc2b 100644 --- a/extra/src/inspectors/dpx/CMakeLists.txt +++ b/extra/src/inspectors/dpx/CMakeLists.txt @@ -3,20 +3,30 @@ project ( dpx CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - dpx SHARED + dpx MODULE dpx.cc ) +if ( APPLE ) + set_target_properties ( + dpx + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + dpx + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS dpx - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" ) diff --git a/extra/src/inspectors/dpx/Makefile.am b/extra/src/inspectors/dpx/Makefile.am index 9171cf5bc..dbd2a056a 100644 --- a/extra/src/inspectors/dpx/Makefile.am +++ b/extra/src/inspectors/dpx/Makefile.am @@ -2,7 +2,7 @@ dpxlibdir = $(pkglibdir)/inspectors AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -dpxlib_LTLIBRARIES = libdpx.la -libdpx_la_CXXFLAGS = $(AM_CXXFLAGS) -libdpx_la_LDFLAGS = -export-dynamic -shared -avoid-version -libdpx_la_SOURCES = dpx.cc +dpxlib_LTLIBRARIES = dpx.la +dpx_la_CXXFLAGS = $(AM_CXXFLAGS) +dpx_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +dpx_la_SOURCES = dpx.cc diff --git a/extra/src/inspectors/http_server/CMakeLists.txt b/extra/src/inspectors/http_server/CMakeLists.txt index ffa5a7731..071529bd0 100644 --- a/extra/src/inspectors/http_server/CMakeLists.txt +++ b/extra/src/inspectors/http_server/CMakeLists.txt @@ -1,13 +1,20 @@ +cmake_minimum_required ( VERSION 2.8.11 ) +project ( http_server CXX ) -set (FILE_LIST - http_inspect.cc - hi_main.cc - hi_main.h +if ( APPLE ) + set ( CMAKE_MACOSX_RPATH OFF ) +endif ( APPLE ) + +include ( FindPkgConfig ) +pkg_search_module ( SNORT3 REQUIRED snort>=3 ) + +add_library ( + http_server MODULE hi_ad.cc hi_ad.h hi_client.cc - hi_client_init.cc hi_client.h + hi_client_init.cc hi_client_norm.cc hi_client_norm.h hi_cmd_lookup.cc @@ -15,12 +22,14 @@ set (FILE_LIST hi_events.cc hi_events.h hi_include.h + hi_main.cc + hi_main.h hi_mi.cc hi_mi.h - hi_norm.cc - hi_norm.h hi_module.cc hi_module.h + hi_norm.cc + hi_norm.h hi_reqmethod_check.h hi_return_codes.h hi_server.cc @@ -36,27 +45,23 @@ set (FILE_LIST hi_ui_iis_unicode_map.cc hi_ui_iis_unicode_map.h hi_util.h + http_inspect.cc ips_http.cc ips_http_header.cc ) -cmake_minimum_required ( VERSION 2.8.11 ) -project ( http_server CXX ) - if ( APPLE ) - set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" + set_target_properties ( + http_server + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" ) endif ( APPLE ) -include ( FindPkgConfig ) -pkg_search_module ( SNORT3 REQUIRED snort>=3 ) - -add_library ( - http_server SHARED - ${FILE_LIST} +set_target_properties ( + http_server + PROPERTIES + PREFIX "" ) set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) @@ -68,6 +73,6 @@ target_include_directories ( install ( TARGETS http_server - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/inspectors" ) - diff --git a/extra/src/inspectors/http_server/Makefile.am b/extra/src/inspectors/http_server/Makefile.am index 946a9d127..03f2b8f3b 100644 --- a/extra/src/inspectors/http_server/Makefile.am +++ b/extra/src/inspectors/http_server/Makefile.am @@ -1,34 +1,10 @@ - -file_list = \ -http_inspect.cc \ -hi_main.cc hi_main.h \ -hi_ad.cc hi_ad.h \ -hi_client.cc hi_client_init.cc hi_client.h \ -hi_client_norm.cc hi_client_norm.h \ -hi_cmd_lookup.cc hi_cmd_lookup.h \ -hi_events.cc hi_events.h \ -hi_include.h \ -hi_mi.cc hi_mi.h \ -hi_module.cc hi_module.h \ -hi_norm.cc hi_norm.h \ -hi_reqmethod_check.h \ -hi_return_codes.h \ -hi_server.cc hi_server.h \ -hi_server_norm.cc hi_server_norm.h \ -hi_si.cc hi_si.h \ -hi_stream_splitter.cc hi_stream_splitter.h \ -hi_ui_config.cc hi_ui_config.h \ -hi_ui_iis_unicode_map.cc hi_ui_iis_unicode_map.h \ -hi_util.h \ -ips_http.cc \ -ips_http_header.cc - http_serverlibdir = $(pkglibdir)/inspectors AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -http_serverlib_LTLIBRARIES = libhttp_server.la -libhttp_server_la_CXXFLAGS = $(AM_CXXFLAGS) -libhttp_server_la_LDFLAGS = -export-dynamic -shared -avoid-version -libhttp_server_la_SOURCES = $(file_list) +http_serverlib_LTLIBRARIES = http_server.la +http_server_la_CXXFLAGS = $(AM_CXXFLAGS) +http_server_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +http_server_la_SOURCES = hi_ad.cc hi_ad.h hi_client.cc hi_client.h hi_client_init.cc hi_client_norm.cc hi_client_norm.h hi_cmd_lookup.cc hi_cmd_lookup.h hi_events.cc hi_events.h hi_include.h hi_main.cc hi_main.h hi_mi.cc hi_mi.h hi_module.cc hi_module.h hi_norm.cc hi_norm.h hi_reqmethod_check.h hi_return_codes.h hi_server.cc hi_server.h hi_server_norm.cc hi_server_norm.h hi_si.cc hi_si.h hi_stream_splitter.cc hi_stream_splitter.h hi_ui_config.cc hi_ui_config.h hi_ui_iis_unicode_map.cc hi_ui_iis_unicode_map.h hi_util.h http_inspect.cc ips_http.cc ips_http_header.cc +EXTRA_DIST = dev_notes.txt diff --git a/extra/src/ips_options/ips_pkt_num/CMakeLists.txt b/extra/src/ips_options/ips_pkt_num/CMakeLists.txt index 764734315..bc80b2452 100644 --- a/extra/src/ips_options/ips_pkt_num/CMakeLists.txt +++ b/extra/src/ips_options/ips_pkt_num/CMakeLists.txt @@ -3,20 +3,30 @@ project ( ips_pkt_num CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - ips_pkt_num SHARED + ips_pkt_num MODULE ips_pkt_num.cc ) +if ( APPLE ) + set_target_properties ( + ips_pkt_num + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + ips_pkt_num + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS ips_pkt_num - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/ips_options" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/ips_options" ) diff --git a/extra/src/ips_options/ips_pkt_num/Makefile.am b/extra/src/ips_options/ips_pkt_num/Makefile.am index b9b02454e..f0d7a0336 100644 --- a/extra/src/ips_options/ips_pkt_num/Makefile.am +++ b/extra/src/ips_options/ips_pkt_num/Makefile.am @@ -2,7 +2,7 @@ ips_pkt_numlibdir = $(pkglibdir)/ips_options AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -ips_pkt_numlib_LTLIBRARIES = libips_pkt_num.la -libips_pkt_num_la_CXXFLAGS = $(AM_CXXFLAGS) -libips_pkt_num_la_LDFLAGS = -export-dynamic -shared -avoid-version -libips_pkt_num_la_SOURCES = ips_pkt_num.cc +ips_pkt_numlib_LTLIBRARIES = ips_pkt_num.la +ips_pkt_num_la_CXXFLAGS = $(AM_CXXFLAGS) +ips_pkt_num_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +ips_pkt_num_la_SOURCES = ips_pkt_num.cc diff --git a/extra/src/ips_options/ips_urg/CMakeLists.txt b/extra/src/ips_options/ips_urg/CMakeLists.txt index 2c1c30378..f4b22dd8b 100644 --- a/extra/src/ips_options/ips_urg/CMakeLists.txt +++ b/extra/src/ips_options/ips_urg/CMakeLists.txt @@ -3,20 +3,30 @@ project ( ips_urg CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - ips_urg SHARED + ips_urg MODULE ips_urg.cc ) +if ( APPLE ) + set_target_properties ( + ips_urg + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + ips_urg + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS ips_urg - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/ips_options" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/ips_options" ) diff --git a/extra/src/ips_options/ips_urg/Makefile.am b/extra/src/ips_options/ips_urg/Makefile.am index f46364b2f..42f20900a 100644 --- a/extra/src/ips_options/ips_urg/Makefile.am +++ b/extra/src/ips_options/ips_urg/Makefile.am @@ -2,7 +2,7 @@ ips_urglibdir = $(pkglibdir)/ips_options AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -ips_urglib_LTLIBRARIES = libips_urg.la -libips_urg_la_CXXFLAGS = $(AM_CXXFLAGS) -libips_urg_la_LDFLAGS = -export-dynamic -shared -avoid-version -libips_urg_la_SOURCES = ips_urg.cc +ips_urglib_LTLIBRARIES = ips_urg.la +ips_urg_la_CXXFLAGS = $(AM_CXXFLAGS) +ips_urg_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +ips_urg_la_SOURCES = ips_urg.cc diff --git a/extra/src/loggers/alert_ex/CMakeLists.txt b/extra/src/loggers/alert_ex/CMakeLists.txt index a571a9fd6..5895c46d0 100644 --- a/extra/src/loggers/alert_ex/CMakeLists.txt +++ b/extra/src/loggers/alert_ex/CMakeLists.txt @@ -3,20 +3,30 @@ project ( alert_ex CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - alert_ex SHARED + alert_ex MODULE alert_ex.cc ) +if ( APPLE ) + set_target_properties ( + alert_ex + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + alert_ex + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS alert_ex - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" ) diff --git a/extra/src/loggers/alert_ex/Makefile.am b/extra/src/loggers/alert_ex/Makefile.am index 82bc0e088..d89743f19 100644 --- a/extra/src/loggers/alert_ex/Makefile.am +++ b/extra/src/loggers/alert_ex/Makefile.am @@ -2,7 +2,7 @@ alert_exlibdir = $(pkglibdir)/loggers AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -alert_exlib_LTLIBRARIES = libalert_ex.la -libalert_ex_la_CXXFLAGS = $(AM_CXXFLAGS) -libalert_ex_la_LDFLAGS = -export-dynamic -shared -avoid-version -libalert_ex_la_SOURCES = alert_ex.cc +alert_exlib_LTLIBRARIES = alert_ex.la +alert_ex_la_CXXFLAGS = $(AM_CXXFLAGS) +alert_ex_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +alert_ex_la_SOURCES = alert_ex.cc diff --git a/extra/src/loggers/alert_unixsock/CMakeLists.txt b/extra/src/loggers/alert_unixsock/CMakeLists.txt index 20ba7e867..15af8c67c 100644 --- a/extra/src/loggers/alert_unixsock/CMakeLists.txt +++ b/extra/src/loggers/alert_unixsock/CMakeLists.txt @@ -3,20 +3,30 @@ project ( alert_unixsock CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - alert_unixsock SHARED + alert_unixsock MODULE alert_unixsock.cc ) +if ( APPLE ) + set_target_properties ( + alert_unixsock + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + alert_unixsock + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS alert_unixsock - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" ) diff --git a/extra/src/loggers/alert_unixsock/Makefile.am b/extra/src/loggers/alert_unixsock/Makefile.am index e19c4e94d..34bf518b0 100644 --- a/extra/src/loggers/alert_unixsock/Makefile.am +++ b/extra/src/loggers/alert_unixsock/Makefile.am @@ -2,7 +2,7 @@ alert_unixsocklibdir = $(pkglibdir)/loggers AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -alert_unixsocklib_LTLIBRARIES = libalert_unixsock.la -libalert_unixsock_la_CXXFLAGS = $(AM_CXXFLAGS) -libalert_unixsock_la_LDFLAGS = -export-dynamic -shared -avoid-version -libalert_unixsock_la_SOURCES = alert_unixsock.cc +alert_unixsocklib_LTLIBRARIES = alert_unixsock.la +alert_unixsock_la_CXXFLAGS = $(AM_CXXFLAGS) +alert_unixsock_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +alert_unixsock_la_SOURCES = alert_unixsock.cc diff --git a/extra/src/loggers/log_null/CMakeLists.txt b/extra/src/loggers/log_null/CMakeLists.txt index 9b06ac602..fb28d07ec 100644 --- a/extra/src/loggers/log_null/CMakeLists.txt +++ b/extra/src/loggers/log_null/CMakeLists.txt @@ -3,20 +3,30 @@ project ( log_null CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - log_null SHARED + log_null MODULE log_null.cc ) +if ( APPLE ) + set_target_properties ( + log_null + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + log_null + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -26,5 +36,6 @@ target_include_directories ( install ( TARGETS log_null - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/loggers" ) diff --git a/extra/src/loggers/log_null/Makefile.am b/extra/src/loggers/log_null/Makefile.am index 2ab0d3a7d..e66b70fac 100644 --- a/extra/src/loggers/log_null/Makefile.am +++ b/extra/src/loggers/log_null/Makefile.am @@ -2,7 +2,7 @@ log_nulllibdir = $(pkglibdir)/loggers AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -log_nulllib_LTLIBRARIES = liblog_null.la -liblog_null_la_CXXFLAGS = $(AM_CXXFLAGS) -liblog_null_la_LDFLAGS = -export-dynamic -shared -avoid-version -liblog_null_la_SOURCES = log_null.cc +log_nulllib_LTLIBRARIES = log_null.la +log_null_la_CXXFLAGS = $(AM_CXXFLAGS) +log_null_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +log_null_la_SOURCES = log_null.cc diff --git a/extra/src/search_engines/lowmem/CMakeLists.txt b/extra/src/search_engines/lowmem/CMakeLists.txt index 44e6cc462..efe7c974a 100644 --- a/extra/src/search_engines/lowmem/CMakeLists.txt +++ b/extra/src/search_engines/lowmem/CMakeLists.txt @@ -3,23 +3,33 @@ project ( lowmem CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - lowmem SHARED + lowmem MODULE lowmem.cc sfksearch.cc sfksearch.h trie_api.cc ) +if ( APPLE ) + set_target_properties ( + lowmem + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + lowmem + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -29,5 +39,6 @@ target_include_directories ( install ( TARGETS lowmem - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/search_engines" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/search_engines" ) diff --git a/extra/src/search_engines/lowmem/Makefile.am b/extra/src/search_engines/lowmem/Makefile.am index 7f3a6d57f..de2a3b731 100644 --- a/extra/src/search_engines/lowmem/Makefile.am +++ b/extra/src/search_engines/lowmem/Makefile.am @@ -2,7 +2,7 @@ lowmemlibdir = $(pkglibdir)/search_engines AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -lowmemlib_LTLIBRARIES = liblowmem.la -liblowmem_la_CXXFLAGS = $(AM_CXXFLAGS) -liblowmem_la_LDFLAGS = -export-dynamic -shared -avoid-version -liblowmem_la_SOURCES = lowmem.cc sfksearch.cc sfksearch.h trie_api.cc +lowmemlib_LTLIBRARIES = lowmem.la +lowmem_la_CXXFLAGS = $(AM_CXXFLAGS) +lowmem_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +lowmem_la_SOURCES = lowmem.cc sfksearch.cc sfksearch.h trie_api.cc diff --git a/extra/src/so_rules/sid_18758/CMakeLists.txt b/extra/src/so_rules/sid_18758/CMakeLists.txt index cf52c60d1..b23072680 100644 --- a/extra/src/so_rules/sid_18758/CMakeLists.txt +++ b/extra/src/so_rules/sid_18758/CMakeLists.txt @@ -3,21 +3,31 @@ project ( sid_18758 CXX ) if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" - ) endif ( APPLE ) include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( - sid_18758 SHARED + sid_18758 MODULE sid_18758.cc sid_18758.h ) +if ( APPLE ) + set_target_properties ( + sid_18758 + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) + +set_target_properties ( + sid_18758 + PROPERTIES + PREFIX "" +) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) target_include_directories ( @@ -27,5 +37,6 @@ target_include_directories ( install ( TARGETS sid_18758 - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/so_rules" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/so_rules" ) diff --git a/extra/src/so_rules/sid_18758/Makefile.am b/extra/src/so_rules/sid_18758/Makefile.am index ae7ebac84..6c7d02f12 100644 --- a/extra/src/so_rules/sid_18758/Makefile.am +++ b/extra/src/so_rules/sid_18758/Makefile.am @@ -2,9 +2,9 @@ sid_18758libdir = $(pkglibdir)/so_rules AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 -sid_18758lib_LTLIBRARIES = libsid_18758.la -libsid_18758_la_CXXFLAGS = $(AM_CXXFLAGS) -libsid_18758_la_LDFLAGS = -export-dynamic -shared -avoid-version -libsid_18758_la_SOURCES = sid_18758.cc sid_18758.h +sid_18758lib_LTLIBRARIES = sid_18758.la +sid_18758_la_CXXFLAGS = $(AM_CXXFLAGS) +sid_18758_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +sid_18758_la_SOURCES = sid_18758.cc sid_18758.h EXTRA_DIST = sid_18758.txt diff --git a/extra/templates/CMakeLists.txt.erb b/extra/templates/CMakeLists.txt.erb index ca644add5..ed369f1f3 100644 --- a/extra/templates/CMakeLists.txt.erb +++ b/extra/templates/CMakeLists.txt.erb @@ -7,15 +7,6 @@ project ( <%= @project.name %><% if @project.language == "CXX" %> CXX<% elsif @p if ( APPLE ) set ( CMAKE_MACOSX_RPATH OFF ) - set ( -%if @project.language == "CXX" - CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" -%elsif @project.language == "C" - CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup" -%end - ) endif ( APPLE ) %end @@ -23,21 +14,29 @@ include ( FindPkgConfig ) pkg_search_module ( SNORT3 REQUIRED snort>=3 ) add_library ( -%if @project.language == "CXX" - <%= @project.libname %> SHARED -%elsif @project.language == "C" <%= @project.libname %> MODULE -%end %for source in @project.sources <%= source %> %end ) -%if @project.language == "CXX" -set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) -%end -%if @project.language == "C" +if ( APPLE ) + set_target_properties ( + <%= @project.libname %> + PROPERTIES + LINK_FLAGS "-undefined dynamic_lookup" + ) +endif ( APPLE ) +set_target_properties ( + <%= @project.libname %> + PROPERTIES + PREFIX "" +) + +%if @project.language == "CXX" +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +%elsif @project.language == "C" set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99" ) %end @@ -48,7 +47,8 @@ target_include_directories ( install ( TARGETS <%= @project.libname %> - LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/<%= @project.dirname %>" + LIBRARY + DESTINATION "lib/${CMAKE_PROJECT_NAME}/<%= @project.dirname %>" ) %end %if !@project.scripts.empty? diff --git a/extra/templates/Makefile.am.erb b/extra/templates/Makefile.am.erb index bd72baa98..520b7b97d 100644 --- a/extra/templates/Makefile.am.erb +++ b/extra/templates/Makefile.am.erb @@ -7,17 +7,14 @@ AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11 AM_CFLAGS = @SNORT3_CFLAGS@ -std=gnu99 %end -<%= @project.libname %>lib_LTLIBRARIES = lib<%= @project.libname %>.la +<%= @project.libname %>lib_LTLIBRARIES = <%= @project.libname %>.la %if @project.language == "CXX" -lib<%= @project.libname %>_la_CXXFLAGS = $(AM_CXXFLAGS) +<%= @project.libname %>_la_CXXFLAGS = $(AM_CXXFLAGS) %elsif @project.language == "C" -lib<%= @project.libname %>_la_CFLAGS = $(AM_CFLAGS) +<%= @project.libname %>_la_CFLAGS = $(AM_CFLAGS) %end -lib<%= @project.libname %>_la_LDFLAGS = -export-dynamic -shared -avoid-version -%if @project.language == "C" -lib<%= @project.libname %>_la_LDFLAGS += -module -%end -lib<%= @project.libname %>_la_SOURCES =<% for source in @project.sources %> <%= source %><% end %> +<%= @project.libname %>_la_LDFLAGS = -module -export-dynamic -avoid-version -shared +<%= @project.libname %>_la_SOURCES =<% for source in @project.sources %> <%= source %><% end %> %end %if !@project.scripts.empty? diff --git a/snort.pc.in b/snort.pc.in index 386456265..93bccee07 100644 --- a/snort.pc.in +++ b/snort.pc.in @@ -8,8 +8,8 @@ datadir=@datadir@ mandir=@mandir@ infodir=@infodir@ -cpp_opts=PCAP LUAJIT DNET DAQ OPENSSL -cpp_opts_other=HWLOC PCRE LZMA INTEL_SOFT_CPM HYPERSCAN +cpp_opts=DAQ LUAJIT +cpp_opts_other=DNET HWLOC HYPERSCAN INTEL_SOFT_CPM LZMA OPENSSL PCAP PCRE PCAP_CPPFLAGS=@PCAP_CPPFLAGS@ LUAJIT_CPPFLAGS=@LUAJIT_CPPFLAGS@ diff --git a/src/actions/CMakeLists.txt b/src/actions/CMakeLists.txt index fdb347570..ddd706b19 100644 --- a/src/actions/CMakeLists.txt +++ b/src/actions/CMakeLists.txt @@ -28,8 +28,8 @@ else (STATIC_IPS_ACTIONS) ${IPS_ACTION_SOURCES} ) - add_shared_library(act_react ips_actions act_react.cc) - add_shared_library(act_reject ips_actions act_reject.cc) + add_dynamic_module(act_react ips_actions act_react.cc) + add_dynamic_module(act_reject ips_actions act_reject.cc) endif (STATIC_IPS_ACTIONS) diff --git a/src/actions/Makefile.am b/src/actions/Makefile.am index 07aab403f..37fbdab84 100644 --- a/src/actions/Makefile.am +++ b/src/actions/Makefile.am @@ -22,13 +22,13 @@ libips_actions_a_SOURCES += $(plugin_list) else actlibdir = $(pkglibdir)/ips_actions -actlib_LTLIBRARIES = libact_react.la -libact_react_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libact_react_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libact_react_la_SOURCES = act_react.cc - -actlib_LTLIBRARIES += libact_reject.la -libact_reject_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libact_reject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libact_reject_la_SOURCES = act_reject.cc +actlib_LTLIBRARIES = act_react.la +act_react_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +act_react_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +act_react_la_SOURCES = act_react.cc + +actlib_LTLIBRARIES += act_reject.la +act_reject_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +act_reject_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +act_reject_la_SOURCES = act_reject.cc endif diff --git a/src/codecs/ip/CMakeLists.txt b/src/codecs/ip/CMakeLists.txt index a2077c796..cfc9ed5b1 100644 --- a/src/codecs/ip/CMakeLists.txt +++ b/src/codecs/ip/CMakeLists.txt @@ -20,25 +20,25 @@ if( STATIC_CODECS ) ) else() - add_shared_library(cd_auth codecs cd_auth.cc) - add_shared_library(cd_dst_opts codecs cd_dst_opts.cc) - add_shared_library(cd_esp codecs cd_esp.cc) - add_shared_library(cd_frag codecs cd_frag.cc) - add_shared_library(cd_gre codecs cd_gre.cc) -# add_shared_library(cd_hopopts codecs cd_hop_opts.cc) - add_shared_library(cd_icmp4 codecs cd_icmp4.cc checksum.h) - add_shared_library(cd_icmp6 codecs cd_icmp6.cc checksum.h) - add_shared_library(cd_igmp codecs cd_igmp.cc) -# add_shared_library(cd_ipv4 codecs cd_ipv4.cc checksum.h) - add_shared_library(cd_ipv6 codecs cd_ipv6.cc checksum.h) - add_shared_library(cd_mobility codecs cd_mobility.cc) - add_shared_library(cd_no_next codecs cd_no_next.cc) - add_shared_library(cd_pgm codecs cd_pgm.cc checksum.h) - add_shared_library(cd_routing codecs cd_routing.cc) - add_shared_library(cd_sun_nd codecs cd_sun_nd.cc) - add_shared_library(cd_swipe codecs cd_swipe.cc) -# add_shared_library(cd_tcp codecs cd_tcp.cc checksum.h) - add_shared_library(cd_udp codecs cd_udp.cc checksum.h) + add_dynamic_module(cd_auth codecs cd_auth.cc) + add_dynamic_module(cd_dst_opts codecs cd_dst_opts.cc) + add_dynamic_module(cd_esp codecs cd_esp.cc) + add_dynamic_module(cd_frag codecs cd_frag.cc) + add_dynamic_module(cd_gre codecs cd_gre.cc) +# add_dynamic_module(cd_hopopts codecs cd_hop_opts.cc) + add_dynamic_module(cd_icmp4 codecs cd_icmp4.cc checksum.h) + add_dynamic_module(cd_icmp6 codecs cd_icmp6.cc checksum.h) + add_dynamic_module(cd_igmp codecs cd_igmp.cc) +# add_dynamic_module(cd_ipv4 codecs cd_ipv4.cc checksum.h) + add_dynamic_module(cd_ipv6 codecs cd_ipv6.cc checksum.h) + add_dynamic_module(cd_mobility codecs cd_mobility.cc) + add_dynamic_module(cd_no_next codecs cd_no_next.cc) + add_dynamic_module(cd_pgm codecs cd_pgm.cc checksum.h) + add_dynamic_module(cd_routing codecs cd_routing.cc) + add_dynamic_module(cd_sun_nd codecs cd_sun_nd.cc) + add_dynamic_module(cd_swipe codecs cd_swipe.cc) +# add_dynamic_module(cd_tcp codecs cd_tcp.cc checksum.h) + add_dynamic_module(cd_udp codecs cd_udp.cc checksum.h) endif() diff --git a/src/codecs/ip/Makefile.am b/src/codecs/ip/Makefile.am index 5b2658346..2b2a75c02 100644 --- a/src/codecs/ip/Makefile.am +++ b/src/codecs/ip/Makefile.am @@ -34,85 +34,85 @@ else ehlibdir = $(pkglibdir)/codecs -ehlib_LTLIBRARIES = libcd_auth.la -libcd_auth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_auth_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_auth_la_SOURCES = cd_auth.cc - -ehlib_LTLIBRARIES += libcd_esp.la -libcd_esp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_esp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_esp_la_SOURCES = cd_esp.cc - -ehlib_LTLIBRARIES += libcd_gre.la -libcd_gre_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_gre_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_gre_la_SOURCES = cd_gre.cc - -ehlib_LTLIBRARIES += libcd_icmp4.la -libcd_icmp4_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_icmp4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_icmp4_la_SOURCES = cd_icmp4.cc checksum.h - -ehlib_LTLIBRARIES += libcd_icmp6.la -libcd_icmp6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_icmp6_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_icmp6_la_SOURCES = cd_icmp6.cc checksum.h - -ehlib_LTLIBRARIES += libcd_igmp.la -libcd_igmp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_igmp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_igmp_la_SOURCES = cd_igmp.cc - -ehlib_LTLIBRARIES += libcd_ipv6.la -libcd_ipv6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_ipv6_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_ipv6_la_SOURCES = cd_ipv6.cc checksum.h - -ehlib_LTLIBRARIES += libcd_mobility.la -libcd_mobility_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_mobility_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_mobility_la_SOURCES = cd_mobility.cc - -ehlib_LTLIBRARIES += libcd_pgm.la -libcd_pgm_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_pgm_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_pgm_la_SOURCES = cd_pgm.cc checksum.h - -ehlib_LTLIBRARIES += libcd_sun_nd.la -libcd_sun_nd_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_sun_nd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_sun_nd_la_SOURCES = cd_sun_nd.cc - -ehlib_LTLIBRARIES += libcd_dst_opts.la -libcd_dst_opts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_dst_opts_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_dst_opts_la_SOURCES = cd_dst_opts.cc - -ehlib_LTLIBRARIES += libcd_frag.la -libcd_frag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_frag_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_frag_la_SOURCES = cd_frag.cc - -ehlib_LTLIBRARIES += libcd_no_next.la -libcd_no_next_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_no_next_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_no_next_la_SOURCES = cd_no_next.cc - -ehlib_LTLIBRARIES += libcd_routing.la -libcd_routing_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_routing_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_routing_la_SOURCES = cd_routing.cc - -ehlib_LTLIBRARIES += libcd_swipe.la -libcd_swipe_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_swipe_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_swipe_la_SOURCES = cd_swipe.cc - -ehlib_LTLIBRARIES += libcd_udp.la -libcd_udp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_udp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_udp_la_SOURCES = cd_udp.cc checksum.h +ehlib_LTLIBRARIES = cd_auth.la +cd_auth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_auth_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_auth_la_SOURCES = cd_auth.cc + +ehlib_LTLIBRARIES += cd_esp.la +cd_esp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_esp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_esp_la_SOURCES = cd_esp.cc + +ehlib_LTLIBRARIES += cd_gre.la +cd_gre_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_gre_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_gre_la_SOURCES = cd_gre.cc + +ehlib_LTLIBRARIES += cd_icmp4.la +cd_icmp4_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_icmp4_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_icmp4_la_SOURCES = cd_icmp4.cc checksum.h + +ehlib_LTLIBRARIES += cd_icmp6.la +cd_icmp6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_icmp6_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_icmp6_la_SOURCES = cd_icmp6.cc checksum.h + +ehlib_LTLIBRARIES += cd_igmp.la +cd_igmp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_igmp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_igmp_la_SOURCES = cd_igmp.cc + +ehlib_LTLIBRARIES += cd_ipv6.la +cd_ipv6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_ipv6_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_ipv6_la_SOURCES = cd_ipv6.cc checksum.h + +ehlib_LTLIBRARIES += cd_mobility.la +cd_mobility_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_mobility_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_mobility_la_SOURCES = cd_mobility.cc + +ehlib_LTLIBRARIES += cd_pgm.la +cd_pgm_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_pgm_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_pgm_la_SOURCES = cd_pgm.cc checksum.h + +ehlib_LTLIBRARIES += cd_sun_nd.la +cd_sun_nd_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_sun_nd_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_sun_nd_la_SOURCES = cd_sun_nd.cc + +ehlib_LTLIBRARIES += cd_dst_opts.la +cd_dst_opts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_dst_opts_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_dst_opts_la_SOURCES = cd_dst_opts.cc + +ehlib_LTLIBRARIES += cd_frag.la +cd_frag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_frag_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_frag_la_SOURCES = cd_frag.cc + +ehlib_LTLIBRARIES += cd_no_next.la +cd_no_next_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_no_next_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_no_next_la_SOURCES = cd_no_next.cc + +ehlib_LTLIBRARIES += cd_routing.la +cd_routing_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_routing_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_routing_la_SOURCES = cd_routing.cc + +ehlib_LTLIBRARIES += cd_swipe.la +cd_swipe_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_swipe_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_swipe_la_SOURCES = cd_swipe.cc + +ehlib_LTLIBRARIES += cd_udp.la +cd_udp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_udp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_udp_la_SOURCES = cd_udp.cc checksum.h endif diff --git a/src/codecs/link/CMakeLists.txt b/src/codecs/link/CMakeLists.txt index da9a9a965..e011823d1 100644 --- a/src/codecs/link/CMakeLists.txt +++ b/src/codecs/link/CMakeLists.txt @@ -13,16 +13,16 @@ if(STATIC_CODECS) cd_vlan.cc ) else(STATIC_CODECS) - add_shared_library(cd_arp codecs cd_arp.cc) - add_shared_library(cd_erspan2 codecs cd_erspan2.cc) - add_shared_library(cd_erspan3 codecs cd_erspan3.cc) - add_shared_library(cd_ciscometadata codecs cd_ciscometadata.cc) - add_shared_library(cd_fabricpath codecs cd_fabricpath.cc) - add_shared_library(cd_mpls codecs cd_mpls.cc) - add_shared_library(cd_ppp_encap codecs cd_ppp_encap.cc) - add_shared_library(cd_pppoe codecs cd_pppoe.cc) - add_shared_library(cd_trans_bridge codecs cd_trans_bridge.cc) - add_shared_library(cd_vlan codecs cd_vlan.cc) + add_dynamic_module(cd_arp codecs cd_arp.cc) + add_dynamic_module(cd_erspan2 codecs cd_erspan2.cc) + add_dynamic_module(cd_erspan3 codecs cd_erspan3.cc) + add_dynamic_module(cd_ciscometadata codecs cd_ciscometadata.cc) + add_dynamic_module(cd_fabricpath codecs cd_fabricpath.cc) + add_dynamic_module(cd_mpls codecs cd_mpls.cc) + add_dynamic_module(cd_ppp_encap codecs cd_ppp_encap.cc) + add_dynamic_module(cd_pppoe codecs cd_pppoe.cc) + add_dynamic_module(cd_trans_bridge codecs cd_trans_bridge.cc) + add_dynamic_module(cd_vlan codecs cd_vlan.cc) endif(STATIC_CODECS) diff --git a/src/codecs/link/Makefile.am b/src/codecs/link/Makefile.am index c39132548..e57edccb0 100644 --- a/src/codecs/link/Makefile.am +++ b/src/codecs/link/Makefile.am @@ -18,53 +18,53 @@ cd_vlan.cc else ehlibdir = $(pkglibdir)/codecs -ehlib_LTLIBRARIES = libcd_arp.la -libcd_arp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_arp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_arp_la_SOURCES = cd_arp.cc +ehlib_LTLIBRARIES = cd_arp.la +cd_arp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_arp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_arp_la_SOURCES = cd_arp.cc -ehlib_LTLIBRARIES += libcd_erspan2.la -libcd_erspan2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_erspan2_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_erspan2_la_SOURCES = cd_erspan2.cc +ehlib_LTLIBRARIES += cd_erspan2.la +cd_erspan2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_erspan2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_erspan2_la_SOURCES = cd_erspan2.cc -ehlib_LTLIBRARIES += libcd_erspan3.la -libcd_erspan3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_erspan3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_erspan3_la_SOURCES = cd_erspan3.cc +ehlib_LTLIBRARIES += cd_erspan3.la +cd_erspan3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_erspan3_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_erspan3_la_SOURCES = cd_erspan3.cc -ehlib_LTLIBRARIES += libcd_ciscometadata.la -libcd_ciscometadata_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_ciscometadata_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_ciscometadata_la_SOURCES = cd_ciscometadata.cc +ehlib_LTLIBRARIES += cd_ciscometadata.la +cd_ciscometadata_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_ciscometadata_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_ciscometadata_la_SOURCES = cd_ciscometadata.cc -ehlib_LTLIBRARIES += libcd_fabricpath.la -libcd_fabricpath_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_fabricpath_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_fabricpath_la_SOURCES = cd_fabricpath.cc +ehlib_LTLIBRARIES += cd_fabricpath.la +cd_fabricpath_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_fabricpath_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_fabricpath_la_SOURCES = cd_fabricpath.cc -ehlib_LTLIBRARIES += libcd_mpls.la -libcd_mpls_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_mpls_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_mpls_la_SOURCES = cd_mpls.cc +ehlib_LTLIBRARIES += cd_mpls.la +cd_mpls_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_mpls_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_mpls_la_SOURCES = cd_mpls.cc -ehlib_LTLIBRARIES += libcd_vlan.la -libcd_vlan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_vlan_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_vlan_la_SOURCES = cd_vlan.cc +ehlib_LTLIBRARIES += cd_vlan.la +cd_vlan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_vlan_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_vlan_la_SOURCES = cd_vlan.cc -ehlib_LTLIBRARIES += libcd_ppp_encap.la -libcd_ppp_encap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_ppp_encap_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_ppp_encap_la_SOURCES = cd_ppp_encap.cc +ehlib_LTLIBRARIES += cd_ppp_encap.la +cd_ppp_encap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_ppp_encap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_ppp_encap_la_SOURCES = cd_ppp_encap.cc -ehlib_LTLIBRARIES += libcd_trans_bridge.la -libcd_trans_bridge_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_trans_bridge_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_trans_bridge_la_SOURCES = cd_trans_bridge.cc +ehlib_LTLIBRARIES += cd_trans_bridge.la +cd_trans_bridge_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_trans_bridge_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_trans_bridge_la_SOURCES = cd_trans_bridge.cc -ehlib_LTLIBRARIES += libcd_pppoe.la -libcd_pppoe_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_pppoe_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_pppoe_la_SOURCES = cd_pppoe.cc +ehlib_LTLIBRARIES += cd_pppoe.la +cd_pppoe_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_pppoe_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_pppoe_la_SOURCES = cd_pppoe.cc endif diff --git a/src/codecs/misc/CMakeLists.txt b/src/codecs/misc/CMakeLists.txt index 8105a2d71..c2febf448 100644 --- a/src/codecs/misc/CMakeLists.txt +++ b/src/codecs/misc/CMakeLists.txt @@ -10,12 +10,12 @@ if(STATIC_CODECS) ) else(STATIC_CODECS) - add_shared_library(cd_gtp codecs cd_gtp.cc) - add_shared_library(cd_icmp4_ip codecs cd_icmp4_ip.cc) - add_shared_library(cd_icmp6_ip codecs cd_icmp6_ip.cc) - add_shared_library(cd_llc codecs cd_llc.cc) - add_shared_library(cd_teredo codecs cd_teredo.cc) - add_shared_library(cd_user codecs cd_user.cc) + add_dynamic_module(cd_gtp codecs cd_gtp.cc) + add_dynamic_module(cd_icmp4_ip codecs cd_icmp4_ip.cc) + add_dynamic_module(cd_icmp6_ip codecs cd_icmp6_ip.cc) + add_dynamic_module(cd_llc codecs cd_llc.cc) + add_dynamic_module(cd_teredo codecs cd_teredo.cc) + add_dynamic_module(cd_user codecs cd_user.cc) endif(STATIC_CODECS) diff --git a/src/codecs/misc/Makefile.am b/src/codecs/misc/Makefile.am index efeee8d23..9e2da955e 100644 --- a/src/codecs/misc/Makefile.am +++ b/src/codecs/misc/Makefile.am @@ -17,34 +17,34 @@ libmisc_codecs_a_SOURCES += $(plugin_list) else cdlibdir = $(pkglibdir)/codecs -cdlib_LTLIBRARIES = libcd_gtp.la -libcd_gtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_gtp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_gtp_la_SOURCES = cd_gtp.cc - -cdlib_LTLIBRARIES += libcd_icmp4_ip.la -libcd_icmp4_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_icmp4_ip_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_icmp4_ip_la_SOURCES = cd_icmp4_ip.cc - -cdlib_LTLIBRARIES += libcd_icmp6_ip.la -libcd_icmp6_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_icmp6_ip_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_icmp6_ip_la_SOURCES = cd_icmp6_ip.cc - -cdlib_LTLIBRARIES += libcd_llc.la -libcd_llc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_llc_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_llc_la_SOURCES = cd_llc.cc - -cdlib_LTLIBRARIES += libcd_teredo.la -libcd_teredo_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_teredo_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_teredo_la_SOURCES = cd_teredo.cc - -cdlib_LTLIBRARIES += libcd_user.la -libcd_user_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_user_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_user_la_SOURCES = cd_user.cc +cdlib_LTLIBRARIES = cd_gtp.la +cd_gtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_gtp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_gtp_la_SOURCES = cd_gtp.cc + +cdlib_LTLIBRARIES += cd_icmp4_ip.la +cd_icmp4_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_icmp4_ip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_icmp4_ip_la_SOURCES = cd_icmp4_ip.cc + +cdlib_LTLIBRARIES += cd_icmp6_ip.la +cd_icmp6_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_icmp6_ip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_icmp6_ip_la_SOURCES = cd_icmp6_ip.cc + +cdlib_LTLIBRARIES += cd_llc.la +cd_llc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_llc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_llc_la_SOURCES = cd_llc.cc + +cdlib_LTLIBRARIES += cd_teredo.la +cd_teredo_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_teredo_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_teredo_la_SOURCES = cd_teredo.cc + +cdlib_LTLIBRARIES += cd_user.la +cd_user_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_user_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_user_la_SOURCES = cd_user.cc endif diff --git a/src/codecs/root/CMakeLists.txt b/src/codecs/root/CMakeLists.txt index 4b6441124..8eabc479e 100644 --- a/src/codecs/root/CMakeLists.txt +++ b/src/codecs/root/CMakeLists.txt @@ -6,7 +6,7 @@ if (STATIC_CODECS) else (STATIC_CODECS) - add_shared_library (cd_eth codecs cd_eth.cc) + add_dynamic_module (cd_eth codecs cd_eth.cc) endif (STATIC_CODECS) diff --git a/src/codecs/root/Makefile.am b/src/codecs/root/Makefile.am index 4479d3b93..614e6dff3 100644 --- a/src/codecs/root/Makefile.am +++ b/src/codecs/root/Makefile.am @@ -8,8 +8,8 @@ cd_eth.cc else ehlibdir = $(pkglibdir)/codecs -ehlib_LTLIBRARIES = libcd_eth.la -libcd_eth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libcd_eth_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libcd_eth_la_SOURCES = cd_eth.cc +ehlib_LTLIBRARIES = cd_eth.la +cd_eth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +cd_eth_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +cd_eth_la_SOURCES = cd_eth.cc endif diff --git a/src/detection/CMakeLists.txt b/src/detection/CMakeLists.txt index 4c96503db..cc3e77160 100644 --- a/src/detection/CMakeLists.txt +++ b/src/detection/CMakeLists.txt @@ -2,7 +2,6 @@ set (DETECTION_INCLUDES detect.h detection_defines.h - detection_options.h detection_util.h rule_option_types.h rules.h @@ -14,6 +13,7 @@ add_library (detection STATIC ${DETECTION_INCLUDES} detect.cc detection_options.cc + detection_options.h detection_util.cc fp_config.cc fp_config.h diff --git a/src/file_api/CMakeLists.txt b/src/file_api/CMakeLists.txt index 26b04a8b8..4fc4f0724 100644 --- a/src/file_api/CMakeLists.txt +++ b/src/file_api/CMakeLists.txt @@ -2,7 +2,6 @@ set( FILE_API_INCLUDES file_api.h file_config.h - file_cache.h file_flows.h file_identifier.h file_lib.h @@ -30,10 +29,8 @@ add_library ( file_api STATIC file_mempool.cc file_mempool.h file_module.cc - file_module.h file_policy.cc file_segment.cc - file_segment.h file_service.cc file_stats.cc file_stats.h diff --git a/src/flow/CMakeLists.txt b/src/flow/CMakeLists.txt index ef9359595..b42387baa 100644 --- a/src/flow/CMakeLists.txt +++ b/src/flow/CMakeLists.txt @@ -1,8 +1,6 @@ set (FLOW_INCLUDES flow.h flow_key.h - ha.h - ha_module.h ) add_library (flow STATIC @@ -17,7 +15,9 @@ add_library (flow STATIC flow_control.h flow_key.cc ha.cc + ha.h ha_module.cc + ha_module.h prune_stats.h session.h ) diff --git a/src/ips_options/CMakeLists.txt b/src/ips_options/CMakeLists.txt index d4e661fcd..24120698f 100644 --- a/src/ips_options/CMakeLists.txt +++ b/src/ips_options/CMakeLists.txt @@ -1,15 +1,15 @@ SET( PLUGIN_LIST - ips_ack.cc - ips_asn1.cc asn1_detect.cc asn1_detect.h - asn1_util.h asn1_util.cc + asn1_util.h + ips_ack.cc + ips_asn1.cc ips_base64.cc ips_bufferlen.cc - ips_byte_test.cc ips_byte_jump.cc + ips_byte_test.cc ips_cvs.cc ips_file_type.cc ips_flags.cc @@ -42,10 +42,10 @@ SET( PLUGIN_LIST set (IPS_SOURCES - ips_byte_extract.cc - ips_byte_extract.h extract.cc extract.h + ips_byte_extract.cc + ips_byte_extract.h ips_classtype.cc ips_content.cc ips_detection_filter.cc @@ -60,9 +60,9 @@ set (IPS_SOURCES ips_metadata.cc ips_options.cc ips_options.h - ips_pkt_data.cc ips_pcre.cc ips_pcre.h + ips_pkt_data.cc ips_reference.cc ips_replace.cc ips_so.cc @@ -89,40 +89,40 @@ else (STATIC_IPS_OPTIONS) ${OPTION_LIST} ) - add_shared_library(ips_ack ips_options ips_ack.cc) - add_shared_library(ips_asn1 ips_options ips_asn1.cc asn1_detect.cc asn1_detect.h asn1_util.h asn1_util.cc) - add_shared_library(ips_base64 ips_options ips_base64.cc) - add_shared_library(ips_bufferlen ips_options ips_bufferlen.cc) - add_shared_library(ips_byte_test ips_options ips_byte_test.cc) - add_shared_library(ips_byte_jump ips_options ips_byte_jump.cc) - add_shared_library(ips_cvs ips_options ips_cvs.cc) - add_shared_library(ips_file_type ips_options ips_file_type.cc) - add_shared_library(ips_flags ips_options ips_flags.cc) - add_shared_library(ips_fragbits ips_options ips_fragbits.cc) - add_shared_library(ips_fragoffset ips_options ips_fragoffset.cc) - add_shared_library(ips_gid ips_options ips_gid.cc) - add_shared_library(ips_icode ips_options ips_icode.cc) - add_shared_library(ips_icmp_id ips_options ips_icmp_id.cc) - add_shared_library(ips_icmp_seq ips_options ips_icmp_seq.cc) - add_shared_library(ips_id ips_options ips_id.cc) - add_shared_library(ips_ipopts ips_options ips_ipopts.cc) - add_shared_library(ips_ip_proto ips_options ips_ip_proto.cc) - add_shared_library(ips_isdataat ips_options ips_isdataat.cc) - add_shared_library(ips_itype ips_options ips_itype.cc) - add_shared_library(ips_msg ips_options ips_msg.cc) - add_shared_library(ips_priority ips_options ips_priority.cc) - add_shared_library(ips_raw_data ips_options ips_raw_data.cc) - add_shared_library(ips_rem ips_options ips_rem.cc) - add_shared_library(ips_rev ips_options ips_rev.cc) - add_shared_library(ips_rpc ips_options ips_rpc.cc) - add_shared_library(ips_sid ips_options ips_sid.cc) - add_shared_library(ips_seq ips_options ips_seq.cc) - add_shared_library(ips_session ips_options ips_session.cc) - add_shared_library(ips_soid ips_options ips_soid.cc) - add_shared_library(ips_tag ips_options ips_tag.cc) - add_shared_library(ips_tos ips_options ips_tos.cc) - add_shared_library(ips_ttl ips_options ips_ttl.cc) - add_shared_library(ips_window ips_options ips_window.cc) + add_dynamic_module(ips_ack ips_options ips_ack.cc) + add_dynamic_module(ips_asn1 ips_options ips_asn1.cc asn1_detect.cc asn1_detect.h asn1_util.h asn1_util.cc) + add_dynamic_module(ips_base64 ips_options ips_base64.cc) + add_dynamic_module(ips_bufferlen ips_options ips_bufferlen.cc) + add_dynamic_module(ips_byte_test ips_options ips_byte_test.cc) + add_dynamic_module(ips_byte_jump ips_options ips_byte_jump.cc) + add_dynamic_module(ips_cvs ips_options ips_cvs.cc) + add_dynamic_module(ips_file_type ips_options ips_file_type.cc) + add_dynamic_module(ips_flags ips_options ips_flags.cc) + add_dynamic_module(ips_fragbits ips_options ips_fragbits.cc) + add_dynamic_module(ips_fragoffset ips_options ips_fragoffset.cc) + add_dynamic_module(ips_gid ips_options ips_gid.cc) + add_dynamic_module(ips_icode ips_options ips_icode.cc) + add_dynamic_module(ips_icmp_id ips_options ips_icmp_id.cc) + add_dynamic_module(ips_icmp_seq ips_options ips_icmp_seq.cc) + add_dynamic_module(ips_id ips_options ips_id.cc) + add_dynamic_module(ips_ipopts ips_options ips_ipopts.cc) + add_dynamic_module(ips_ip_proto ips_options ips_ip_proto.cc) + add_dynamic_module(ips_isdataat ips_options ips_isdataat.cc) + add_dynamic_module(ips_itype ips_options ips_itype.cc) + add_dynamic_module(ips_msg ips_options ips_msg.cc) + add_dynamic_module(ips_priority ips_options ips_priority.cc) + add_dynamic_module(ips_raw_data ips_options ips_raw_data.cc) + add_dynamic_module(ips_rem ips_options ips_rem.cc) + add_dynamic_module(ips_rev ips_options ips_rev.cc) + add_dynamic_module(ips_rpc ips_options ips_rpc.cc) + add_dynamic_module(ips_sid ips_options ips_sid.cc) + add_dynamic_module(ips_seq ips_options ips_seq.cc) + add_dynamic_module(ips_session ips_options ips_session.cc) + add_dynamic_module(ips_soid ips_options ips_soid.cc) + add_dynamic_module(ips_tag ips_options ips_tag.cc) + add_dynamic_module(ips_tos ips_options ips_tos.cc) + add_dynamic_module(ips_ttl ips_options ips_ttl.cc) + add_dynamic_module(ips_window ips_options ips_window.cc) endif (STATIC_IPS_OPTIONS) diff --git a/src/ips_options/Makefile.am b/src/ips_options/Makefile.am index a35393937..11f339eb6 100644 --- a/src/ips_options/Makefile.am +++ b/src/ips_options/Makefile.am @@ -2,13 +2,14 @@ noinst_LIBRARIES = libips_options.a plugin_list = \ -ips_ack.cc \ -ips_asn1.cc \ asn1_detect.cc asn1_detect.h \ asn1_util.cc asn1_util.h \ +ips_ack.cc \ +ips_asn1.cc \ ips_base64.cc \ -ips_byte_test.cc \ +ips_bufferlen.cc \ ips_byte_jump.cc \ +ips_byte_test.cc \ ips_cvs.cc \ ips_file_type.cc \ ips_flags.cc \ @@ -36,12 +37,11 @@ ips_soid.cc \ ips_tag.cc \ ips_tos.cc \ ips_ttl.cc \ -ips_bufferlen.cc \ ips_window.cc libips_options_a_SOURCES = \ -ips_byte_extract.cc ips_byte_extract.h \ extract.cc extract.h \ +ips_byte_extract.cc ips_byte_extract.h \ ips_classtype.cc \ ips_content.cc \ ips_detection_filter.cc \ @@ -53,8 +53,8 @@ ips_hash.cc \ ips_luajit.cc \ ips_metadata.cc \ ips_options.cc ips_options.h \ -ips_pkt_data.cc \ ips_pcre.cc ips_pcre.h \ +ips_pkt_data.cc \ ips_reference.cc \ ips_replace.cc \ ips_so.cc @@ -69,191 +69,191 @@ libips_options_a_SOURCES += $(plugin_list) else optlibdir = $(pkglibdir)/ips_options -optlib_LTLIBRARIES = libips_ack.la -libips_ack_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_ack_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_ack_la_SOURCES = ips_ack.cc - -optlib_LTLIBRARIES += libips_asn1.la -libips_asn1_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_asn1_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_asn1_la_SOURCES = ips_asn1.cc asn1_detect.cc asn1_detect.h asn1_util.h asn1_util.cc - -optlib_LTLIBRARIES += libips_base64.la -libips_base64_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_base64_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_base64_la_SOURCES = ips_base64.cc - -optlib_LTLIBRARIES += libips_bufferlen.la -libips_bufferlen_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_bufferlen_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_bufferlen_la_SOURCES = ips_bufferlen.cc - -optlib_LTLIBRARIES += libips_byte_test.la -libips_byte_test_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_byte_test_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_byte_test_la_SOURCES = ips_byte_test.cc - -optlib_LTLIBRARIES += libips_byte_jump.la -libips_byte_jump_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_byte_jump_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_byte_jump_la_SOURCES = ips_byte_jump.cc - -#optlib_LTLIBRARIES += libips_content.la -#libips_content_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libips_content_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libips_content_la_SOURCES = ips_content.cc - -optlib_LTLIBRARIES += libips_cvs.la -libips_cvs_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_cvs_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_cvs_la_SOURCES = ips_cvs.cc - -optlib_LTLIBRARIES += libips_file_type.la -libips_file_type_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_file_type_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_file_type_la_SOURCES = ips_file_type.cc - -optlib_LTLIBRARIES += libips_dsize.la -libips_dsize_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_dsize_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_dsize_la_SOURCES = ips_dsize.cc - -optlib_LTLIBRARIES += libips_flags.la -libips_flags_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_flags_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_flags_la_SOURCES = ips_flags.cc - -optlib_LTLIBRARIES += libips_fragbits.la -libips_fragbits_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_fragbits_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_fragbits_la_SOURCES = ips_fragbits.cc - -optlib_LTLIBRARIES += libips_fragoffset.la -libips_fragoffset_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_fragoffset_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_fragoffset_la_SOURCES = ips_fragoffset.cc - -optlib_LTLIBRARIES += libips_gid.la -libips_gid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_gid_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_gid_la_SOURCES = ips_gid.cc +optlib_LTLIBRARIES = ips_ack.la +ips_ack_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_ack_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_ack_la_SOURCES = ips_ack.cc + +optlib_LTLIBRARIES += ips_asn1.la +ips_asn1_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_asn1_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_asn1_la_SOURCES = ips_asn1.cc asn1_detect.cc asn1_detect.h asn1_util.h asn1_util.cc + +optlib_LTLIBRARIES += ips_base64.la +ips_base64_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_base64_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_base64_la_SOURCES = ips_base64.cc + +optlib_LTLIBRARIES += ips_bufferlen.la +ips_bufferlen_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_bufferlen_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_bufferlen_la_SOURCES = ips_bufferlen.cc + +optlib_LTLIBRARIES += ips_byte_test.la +ips_byte_test_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_byte_test_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_byte_test_la_SOURCES = ips_byte_test.cc + +optlib_LTLIBRARIES += ips_byte_jump.la +ips_byte_jump_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_byte_jump_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_byte_jump_la_SOURCES = ips_byte_jump.cc + +#optlib_LTLIBRARIES += ips_content.la +#ips_content_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#ips_content_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#ips_content_la_SOURCES = ips_content.cc + +optlib_LTLIBRARIES += ips_cvs.la +ips_cvs_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_cvs_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_cvs_la_SOURCES = ips_cvs.cc + +optlib_LTLIBRARIES += ips_file_type.la +ips_file_type_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_file_type_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_file_type_la_SOURCES = ips_file_type.cc + +#optlib_LTLIBRARIES += ips_dsize.la +#ips_dsize_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#ips_dsize_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#ips_dsize_la_SOURCES = ips_dsize.cc + +optlib_LTLIBRARIES += ips_flags.la +ips_flags_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_flags_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_flags_la_SOURCES = ips_flags.cc + +optlib_LTLIBRARIES += ips_fragbits.la +ips_fragbits_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_fragbits_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_fragbits_la_SOURCES = ips_fragbits.cc + +optlib_LTLIBRARIES += ips_fragoffset.la +ips_fragoffset_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_fragoffset_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_fragoffset_la_SOURCES = ips_fragoffset.cc + +optlib_LTLIBRARIES += ips_gid.la +ips_gid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_gid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_gid_la_SOURCES = ips_gid.cc # can't be linked dynamically yet -#optlib_LTLIBRARIES += libips_hash.la -#libips_hash_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libips_hash_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libips_hash_la_SOURCES = ips_hash.cc - -optlib_LTLIBRARIES += libips_icmp_id.la -libips_icmp_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_icmp_id_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_icmp_id_la_SOURCES = ips_icmp_id.cc - -optlib_LTLIBRARIES += libips_icmp_seq.la -libips_icmp_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_icmp_seq_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_icmp_seq_la_SOURCES = ips_icmp_seq.cc - -optlib_LTLIBRARIES += libips_icode.la -libips_icode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_icode_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_icode_la_SOURCES = ips_icode.cc - -optlib_LTLIBRARIES += libips_id.la -libips_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_id_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_id_la_SOURCES = ips_id.cc - -optlib_LTLIBRARIES += libips_ipopts.la -libips_ipopts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_ipopts_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_ipopts_la_SOURCES = ips_ipopts.cc - -optlib_LTLIBRARIES += libips_ip_proto.la -libips_ip_proto_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_ip_proto_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_ip_proto_la_SOURCES = ips_ip_proto.cc - -optlib_LTLIBRARIES += libips_isdataat.la -libips_isdataat_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_isdataat_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_isdataat_la_SOURCES = ips_isdataat.cc - -optlib_LTLIBRARIES += libips_itype.la -libips_itype_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_itype_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_itype_la_SOURCES = ips_itype.cc - -optlib_LTLIBRARIES += libips_msg.la -libips_msg_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_msg_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_msg_la_SOURCES = ips_msg.cc - -optlib_LTLIBRARIES += libips_priority.la -libips_priority_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_priority_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_priority_la_SOURCES = ips_priority.cc - -optlib_LTLIBRARIES += libips_raw_data.la -libips_raw_data_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_raw_data_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_raw_data_la_SOURCES = ips_raw_data.cc - -optlib_LTLIBRARIES += libips_rem.la -libips_rem_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_rem_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_rem_la_SOURCES = ips_rem.cc - -optlib_LTLIBRARIES += libips_rev.la -libips_rev_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_rev_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_rev_la_SOURCES = ips_rev.cc - -optlib_LTLIBRARIES += libips_rpc.la -libips_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_rpc_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_rpc_la_SOURCES = ips_rpc.cc - -optlib_LTLIBRARIES += libips_seq.la -libips_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_seq_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_seq_la_SOURCES = ips_seq.cc - -optlib_LTLIBRARIES += libips_session.la -libips_session_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_session_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_session_la_SOURCES = ips_session.cc - -optlib_LTLIBRARIES += libips_sid.la -libips_sid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_sid_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_sid_la_SOURCES = ips_sid.cc - -optlib_LTLIBRARIES += libips_soid.la -libips_soid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_soid_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_soid_la_SOURCES = ips_soid.cc - -optlib_LTLIBRARIES += libips_tos.la -libips_tos_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_tos_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_tos_la_SOURCES = ips_tos.cc - -optlib_LTLIBRARIES += libips_tag.la -libips_tag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_tag_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_tag_la_SOURCES = ips_tag.cc - -optlib_LTLIBRARIES += libips_ttl.la -libips_ttl_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_ttl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_ttl_la_SOURCES = ips_ttl.cc - -optlib_LTLIBRARIES += libips_window.la -libips_window_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libips_window_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libips_window_la_SOURCES = ips_window.cc +#optlib_LTLIBRARIES += ips_hash.la +#ips_hash_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#ips_hash_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#ips_hash_la_SOURCES = ips_hash.cc + +optlib_LTLIBRARIES += ips_icmp_id.la +ips_icmp_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_icmp_id_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_icmp_id_la_SOURCES = ips_icmp_id.cc + +optlib_LTLIBRARIES += ips_icmp_seq.la +ips_icmp_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_icmp_seq_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_icmp_seq_la_SOURCES = ips_icmp_seq.cc + +optlib_LTLIBRARIES += ips_icode.la +ips_icode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_icode_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_icode_la_SOURCES = ips_icode.cc + +optlib_LTLIBRARIES += ips_id.la +ips_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_id_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_id_la_SOURCES = ips_id.cc + +optlib_LTLIBRARIES += ips_ipopts.la +ips_ipopts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_ipopts_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_ipopts_la_SOURCES = ips_ipopts.cc + +optlib_LTLIBRARIES += ips_ip_proto.la +ips_ip_proto_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_ip_proto_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_ip_proto_la_SOURCES = ips_ip_proto.cc + +optlib_LTLIBRARIES += ips_isdataat.la +ips_isdataat_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_isdataat_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_isdataat_la_SOURCES = ips_isdataat.cc + +optlib_LTLIBRARIES += ips_itype.la +ips_itype_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_itype_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_itype_la_SOURCES = ips_itype.cc + +optlib_LTLIBRARIES += ips_msg.la +ips_msg_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_msg_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_msg_la_SOURCES = ips_msg.cc + +optlib_LTLIBRARIES += ips_priority.la +ips_priority_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_priority_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_priority_la_SOURCES = ips_priority.cc + +optlib_LTLIBRARIES += ips_raw_data.la +ips_raw_data_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_raw_data_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_raw_data_la_SOURCES = ips_raw_data.cc + +optlib_LTLIBRARIES += ips_rem.la +ips_rem_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_rem_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_rem_la_SOURCES = ips_rem.cc + +optlib_LTLIBRARIES += ips_rev.la +ips_rev_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_rev_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_rev_la_SOURCES = ips_rev.cc + +optlib_LTLIBRARIES += ips_rpc.la +ips_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_rpc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_rpc_la_SOURCES = ips_rpc.cc + +optlib_LTLIBRARIES += ips_seq.la +ips_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_seq_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_seq_la_SOURCES = ips_seq.cc + +optlib_LTLIBRARIES += ips_session.la +ips_session_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_session_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_session_la_SOURCES = ips_session.cc + +optlib_LTLIBRARIES += ips_sid.la +ips_sid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_sid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_sid_la_SOURCES = ips_sid.cc + +optlib_LTLIBRARIES += ips_soid.la +ips_soid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_soid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_soid_la_SOURCES = ips_soid.cc + +optlib_LTLIBRARIES += ips_tos.la +ips_tos_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_tos_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_tos_la_SOURCES = ips_tos.cc + +optlib_LTLIBRARIES += ips_tag.la +ips_tag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_tag_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_tag_la_SOURCES = ips_tag.cc + +optlib_LTLIBRARIES += ips_ttl.la +ips_ttl_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_ttl_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_ttl_la_SOURCES = ips_ttl.cc + +optlib_LTLIBRARIES += ips_window.la +ips_window_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ips_window_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ips_window_la_SOURCES = ips_window.cc endif if BUILD_CPPUTESTS diff --git a/src/loggers/CMakeLists.txt b/src/loggers/CMakeLists.txt index c2cbf464c..0b2139ac2 100644 --- a/src/loggers/CMakeLists.txt +++ b/src/loggers/CMakeLists.txt @@ -37,13 +37,13 @@ else (STATIC_LOGGERS) ${LOGGER_SOURCES} ) - add_shared_library(alert_csv loggers alert_csv.cc) - add_shared_library(alert_fast loggers alert_fast.cc) - add_shared_library(alert_full loggers alert_full.cc) - add_shared_library(alert_syslog loggers alert_syslog.cc) - add_shared_library(log_hext loggers log_hext.cc) - add_shared_library(log_pcap loggers log_pcap.cc) - add_shared_library(unified2 loggers unified2.cc) + add_dynamic_module(alert_csv loggers alert_csv.cc) + add_dynamic_module(alert_fast loggers alert_fast.cc) + add_dynamic_module(alert_full loggers alert_full.cc) + add_dynamic_module(alert_syslog loggers alert_syslog.cc) + add_dynamic_module(log_hext loggers log_hext.cc) + add_dynamic_module(log_pcap loggers log_pcap.cc) + add_dynamic_module(unified2 loggers unified2.cc) endif (STATIC_LOGGERS) diff --git a/src/loggers/Makefile.am b/src/loggers/Makefile.am index c5d51c1e0..f5b4fc7df 100644 --- a/src/loggers/Makefile.am +++ b/src/loggers/Makefile.am @@ -25,39 +25,39 @@ libloggers_a_SOURCES += $(plugin_list) else ehlibdir = $(pkglibdir)/loggers -ehlib_LTLIBRARIES = libalert_csv.la -libalert_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libalert_csv_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libalert_csv_la_SOURCES = alert_csv.cc - -ehlib_LTLIBRARIES += libalert_fast.la -libalert_fast_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libalert_fast_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libalert_fast_la_SOURCES = alert_fast.cc - -ehlib_LTLIBRARIES += libalert_full.la -libalert_full_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libalert_full_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libalert_full_la_SOURCES = alert_full.cc - -ehlib_LTLIBRARIES += libalert_syslog.la -libalert_syslog_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libalert_syslog_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libalert_syslog_la_SOURCES = alert_syslog.cc - -ehlib_LTLIBRARIES += liblog_hext.la -liblog_hext_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -liblog_hext_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -liblog_hext_la_SOURCES = log_hext.cc - -ehlib_LTLIBRARIES += liblog_pcap.la -liblog_pcap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -liblog_pcap_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -liblog_pcap_la_SOURCES = log_pcap.cc - -ehlib_LTLIBRARIES += libunified2.la -libunified2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libunified2_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libunified2_la_SOURCES = unified2.cc +ehlib_LTLIBRARIES = alert_csv.la +alert_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +alert_csv_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +alert_csv_la_SOURCES = alert_csv.cc + +ehlib_LTLIBRARIES += alert_fast.la +alert_fast_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +alert_fast_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +alert_fast_la_SOURCES = alert_fast.cc + +ehlib_LTLIBRARIES += alert_full.la +alert_full_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +alert_full_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +alert_full_la_SOURCES = alert_full.cc + +ehlib_LTLIBRARIES += alert_syslog.la +alert_syslog_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +alert_syslog_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +alert_syslog_la_SOURCES = alert_syslog.cc + +ehlib_LTLIBRARIES += log_hext.la +log_hext_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +log_hext_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +log_hext_la_SOURCES = log_hext.cc + +ehlib_LTLIBRARIES += log_pcap.la +log_pcap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +log_pcap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +log_pcap_la_SOURCES = log_pcap.cc + +ehlib_LTLIBRARIES += unified2.la +unified2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +unified2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +unified2_la_SOURCES = unified2.cc endif diff --git a/src/lua/Makefile.am b/src/lua/Makefile.am index 411c748b4..813f562fe 100644 --- a/src/lua/Makefile.am +++ b/src/lua/Makefile.am @@ -2,29 +2,18 @@ AUTOMAKE_OPTIONS=foreign no-dependencies noinst_LIBRARIES = liblua.a -x_includedir = $(pkgincludedir)/lua - -x_include_HEADERS = \ -lua.h \ -lua_ref.h \ -lua_iface.h \ -lua_table.h \ -lua_arg.h \ -lua_stack.h \ -lua_util.h - liblua_a_SOURCES = \ lua.cc \ lua.h \ +lua_arg.h \ +lua_iface.h \ lua_ref.cc \ lua_ref.h \ -lua_iface.h \ -lua_util.cc \ -lua_util.h \ -lua_table.h \ -lua_arg.h \ lua_stack.h \ -lua_test_common.h +lua_table.h \ +lua_test_common.h \ +lua_util.cc \ +lua_util.h if ENABLE_UNIT_TESTS liblua_a_SOURCES += lua_stack_test.cc diff --git a/src/managers/plugin_manager.cc b/src/managers/plugin_manager.cc index 102abf558..f1292bf22 100644 --- a/src/managers/plugin_manager.cc +++ b/src/managers/plugin_manager.cc @@ -55,11 +55,7 @@ using namespace std; -#if defined(__linux__) #define lib_pattern "*.so" -#else -#define lib_pattern "*.dylib" -#endif struct Symbol { diff --git a/src/network_inspectors/appid/CMakeLists.txt b/src/network_inspectors/appid/CMakeLists.txt index 60310cf07..c02b51095 100644 --- a/src/network_inspectors/appid/CMakeLists.txt +++ b/src/network_inspectors/appid/CMakeLists.txt @@ -177,7 +177,7 @@ set ( APPID_SOURCES ${UTIL_APPID_SOURCES} ) #else (STATIC_INSPECTORS) -# add_shared_library(appid inspectors +# add_dynamic_module(appid inspectors # ${APPID_SOURCES} # ${CP_APPID_SOURCES} # ${DP_APPID_SOURCES} diff --git a/src/network_inspectors/appid/Makefile.am b/src/network_inspectors/appid/Makefile.am index 4e6135154..541fcf161 100644 --- a/src/network_inspectors/appid/Makefile.am +++ b/src/network_inspectors/appid/Makefile.am @@ -171,10 +171,10 @@ $(dp_file_list) \ $(util_file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libappid.la -#libappid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libappid_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libappid_la_SOURCES = $(file_list) \ +#shlib_LTLIBRARIES = appid.la +#appid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#appid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#appid_la_SOURCES = $(file_list) \ #$(cp_file_list) \ #$(sp_file_list) \ #$(dp_file_list) \ diff --git a/src/network_inspectors/arp_spoof/CMakeLists.txt b/src/network_inspectors/arp_spoof/CMakeLists.txt index 2f101a27c..6e9894d89 100644 --- a/src/network_inspectors/arp_spoof/CMakeLists.txt +++ b/src/network_inspectors/arp_spoof/CMakeLists.txt @@ -11,6 +11,6 @@ if (STATIC_INSPECTORS) ) else (STATIC_INSPECTORS) - add_shared_library(arp_spoof inspectors ${FILE_LIST}) + add_dynamic_module(arp_spoof inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/network_inspectors/arp_spoof/Makefile.am b/src/network_inspectors/arp_spoof/Makefile.am index 22a2a8966..132b2bf8f 100644 --- a/src/network_inspectors/arp_spoof/Makefile.am +++ b/src/network_inspectors/arp_spoof/Makefile.am @@ -9,8 +9,8 @@ noinst_LIBRARIES = libarp_spoof.a libarp_spoof_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libarp_spoof.la -libarp_spoof_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libarp_spoof_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libarp_spoof_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = arp_spoof.la +arp_spoof_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +arp_spoof_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +arp_spoof_la_SOURCES = $(file_list) endif diff --git a/src/network_inspectors/binder/CMakeLists.txt b/src/network_inspectors/binder/CMakeLists.txt index 5eb80843d..02e379357 100644 --- a/src/network_inspectors/binder/CMakeLists.txt +++ b/src/network_inspectors/binder/CMakeLists.txt @@ -11,7 +11,7 @@ set(FILE_LIST add_library(binder STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) -# add_shared_library(binder inspectors ${FILE_LIST}) +# add_dynamic_module(binder inspectors ${FILE_LIST}) # #endif (STATIC_INSPECTORS) diff --git a/src/network_inspectors/binder/Makefile.am b/src/network_inspectors/binder/Makefile.am index 484d64c7e..03ed4c90f 100644 --- a/src/network_inspectors/binder/Makefile.am +++ b/src/network_inspectors/binder/Makefile.am @@ -12,10 +12,10 @@ libbinder_a_SOURCES = $(file_list) #else # need to fix undefineds first :( #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libbinder.la -#libbinder_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libbinder_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libbinder_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = binder.la +#binder_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#binder_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#binder_la_SOURCES = $(file_list) #endif if ENABLE_UNIT_TESTS diff --git a/src/network_inspectors/packet_capture/CMakeLists.txt b/src/network_inspectors/packet_capture/CMakeLists.txt index 0038c1cc7..17da45eed 100644 --- a/src/network_inspectors/packet_capture/CMakeLists.txt +++ b/src/network_inspectors/packet_capture/CMakeLists.txt @@ -10,6 +10,6 @@ if (STATIC_INSPECTORS) target_link_libraries(packet_capture utils) else (STATIC_INSPECTORS) - add_shared_library(packet_capture inspectors ${FILE_LIST}) + add_dynamic_module(packet_capture inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/network_inspectors/packet_capture/Makefile.am b/src/network_inspectors/packet_capture/Makefile.am index 705899655..731b14398 100644 --- a/src/network_inspectors/packet_capture/Makefile.am +++ b/src/network_inspectors/packet_capture/Makefile.am @@ -8,9 +8,9 @@ noinst_LIBRARIES = libpacket_capture.a libpacket_capture_a_SOURCES = ${file_list} else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libpacket_capture.la -libpacket_capture_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libpacket_capture_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libpacket_capture_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = packet_capture.la +packet_capture_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +packet_capture_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +packet_capture_la_SOURCES = $(file_list) endif diff --git a/src/network_inspectors/port_scan/Makefile.am b/src/network_inspectors/port_scan/Makefile.am index ded09b633..35e566c2d 100644 --- a/src/network_inspectors/port_scan/Makefile.am +++ b/src/network_inspectors/port_scan/Makefile.am @@ -17,8 +17,8 @@ libport_scan_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libport_scan.la -#libport_scan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libport_scan_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libport_scan_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = port_scan.la +#port_scan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#port_scan_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#port_scan_la_SOURCES = $(file_list) #endif diff --git a/src/search_engines/CMakeLists.txt b/src/search_engines/CMakeLists.txt index fe3648a31..8927198ec 100644 --- a/src/search_engines/CMakeLists.txt +++ b/src/search_engines/CMakeLists.txt @@ -66,8 +66,8 @@ else ( STATIC_SEARCH_ENGINES) ${SEARCH_ENGINE_INCLUDES} ) - add_shared_library(acsmx search_engines ${ACSMX_SOURCES}) - add_shared_library(acsmx2 search_engines ${ACSMX2_SOURCES}) + add_dynamic_module(acsmx search_engines ${ACSMX_SOURCES}) + add_dynamic_module(acsmx2 search_engines ${ACSMX2_SOURCES}) endif (STATIC_SEARCH_ENGINES) diff --git a/src/search_engines/Makefile.am b/src/search_engines/Makefile.am index 371078831..20ee411c3 100644 --- a/src/search_engines/Makefile.am +++ b/src/search_engines/Makefile.am @@ -57,15 +57,15 @@ libsearch_engines_a_SOURCES += $(plugin_list) else mpselibdir = $(pkglibdir)/search_engines -mpselib_LTLIBRARIES = libacsmx.la -libacsmx_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libacsmx_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libacsmx_la_SOURCES = $(acsmx_sources) +mpselib_LTLIBRARIES = acsmx.la +acsmx_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +acsmx_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +acsmx_la_SOURCES = $(acsmx_sources) -mpselib_LTLIBRARIES += libacsmx2.la -libacsmx2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libacsmx2_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libacsmx2_la_SOURCES = $(acsmx2_sources) +mpselib_LTLIBRARIES += acsmx2.la +acsmx2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +acsmx2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +acsmx2_la_SOURCES = $(acsmx2_sources) endif if BUILD_CPPUTESTS diff --git a/src/service_inspectors/back_orifice/CMakeLists.txt b/src/service_inspectors/back_orifice/CMakeLists.txt index 1f657bf0b..d6441acdf 100644 --- a/src/service_inspectors/back_orifice/CMakeLists.txt +++ b/src/service_inspectors/back_orifice/CMakeLists.txt @@ -7,6 +7,6 @@ if (STATIC_INSPECTORS) add_library( back_orifice STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(back_orifice inspectors ${FILE_LIST}) + add_dynamic_module(back_orifice inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/back_orifice/Makefile.am b/src/service_inspectors/back_orifice/Makefile.am index 4aaf8f6ab..204031242 100644 --- a/src/service_inspectors/back_orifice/Makefile.am +++ b/src/service_inspectors/back_orifice/Makefile.am @@ -7,9 +7,9 @@ noinst_LIBRARIES = libback_orifice.a libback_orifice_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libback_orifice.la -libback_orifice_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libback_orifice_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libback_orifice_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = back_orifice.la +back_orifice_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +back_orifice_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +back_orifice_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/dce_rpc/CMakeLists.txt b/src/service_inspectors/dce_rpc/CMakeLists.txt index 69126cdb0..733526d6c 100644 --- a/src/service_inspectors/dce_rpc/CMakeLists.txt +++ b/src/service_inspectors/dce_rpc/CMakeLists.txt @@ -48,6 +48,6 @@ if (STATIC_INSPECTORS) add_library(dce_rpc STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(dce_rpc inspectors ${FILE_LIST}) + add_dynamic_module(dce_rpc inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/dce_rpc/Makefile.am b/src/service_inspectors/dce_rpc/Makefile.am index 38ce2ea8c..55e1655fc 100644 --- a/src/service_inspectors/dce_rpc/Makefile.am +++ b/src/service_inspectors/dce_rpc/Makefile.am @@ -46,8 +46,8 @@ noinst_LIBRARIES = libdce_rpc.a libdce_rpc_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libdce_rpc.la -libdce_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libdce_rpc_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libdce_rpc_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = dce_rpc.la +dce_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +dce_rpc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +dce_rpc_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/dnp3/CMakeLists.txt b/src/service_inspectors/dnp3/CMakeLists.txt index e4394ccd5..3f23b6d75 100644 --- a/src/service_inspectors/dnp3/CMakeLists.txt +++ b/src/service_inspectors/dnp3/CMakeLists.txt @@ -21,7 +21,7 @@ if (STATIC_INSPECTORS) add_library(dnp3 STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(dnp3 inspectors ${FILE_LIST}) + add_dynamic_module(dnp3 inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/dnp3/Makefile.am b/src/service_inspectors/dnp3/Makefile.am index 1aa081eeb..3231d5c9b 100644 --- a/src/service_inspectors/dnp3/Makefile.am +++ b/src/service_inspectors/dnp3/Makefile.am @@ -21,8 +21,8 @@ noinst_LIBRARIES = libdnp3.a libdnp3_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libdnp3.la -libdnp3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libdnp3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libdnp3_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = dnp3.la +dnp3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +dnp3_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +dnp3_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/dns/CMakeLists.txt b/src/service_inspectors/dns/CMakeLists.txt index 94ab376fe..57e53c0aa 100644 --- a/src/service_inspectors/dns/CMakeLists.txt +++ b/src/service_inspectors/dns/CMakeLists.txt @@ -10,6 +10,6 @@ if (STATIC_INSPECTORS) add_library( dns STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(dns inspectors ${FILE_LIST}) + add_dynamic_module(dns inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/dns/Makefile.am b/src/service_inspectors/dns/Makefile.am index 2099ef9b4..3ef7c0a55 100644 --- a/src/service_inspectors/dns/Makefile.am +++ b/src/service_inspectors/dns/Makefile.am @@ -10,9 +10,9 @@ noinst_LIBRARIES = libdns.a libdns_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libdns.la -libdns_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libdns_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libdns_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = dns.la +dns_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +dns_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +dns_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/ftp_telnet/CMakeLists.txt b/src/service_inspectors/ftp_telnet/CMakeLists.txt index 8df136ef4..a79783160 100644 --- a/src/service_inspectors/ftp_telnet/CMakeLists.txt +++ b/src/service_inspectors/ftp_telnet/CMakeLists.txt @@ -39,7 +39,7 @@ if (STATIC_INSPECTORS) target_link_libraries(ftp_telnet utils) else (STATIC_INSPECTORS) - add_shared_library(ftp_telnet inspectors ${FILE_LIST}) + add_dynamic_module(ftp_telnet inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/ftp_telnet/Makefile.am b/src/service_inspectors/ftp_telnet/Makefile.am index 1d1e03081..cd7a2ac82 100644 --- a/src/service_inspectors/ftp_telnet/Makefile.am +++ b/src/service_inspectors/ftp_telnet/Makefile.am @@ -24,9 +24,9 @@ noinst_LIBRARIES = libftp_telnet.a libftp_telnet_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libftp_telnet.la -libftp_telnet_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libftp_telnet_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libftp_telnet_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = ftp_telnet.la +ftp_telnet_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ftp_telnet_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ftp_telnet_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/gtp/CMakeLists.txt b/src/service_inspectors/gtp/CMakeLists.txt index c383a7519..a2795a1f6 100644 --- a/src/service_inspectors/gtp/CMakeLists.txt +++ b/src/service_inspectors/gtp/CMakeLists.txt @@ -17,7 +17,7 @@ if (STATIC_INSPECTORS) add_library(gtp_inspect STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(gtp_inspect inspectors ${FILE_LIST}) + add_dynamic_module(gtp_inspect inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/gtp/Makefile.am b/src/service_inspectors/gtp/Makefile.am index b8ac0701e..ce2d42f85 100644 --- a/src/service_inspectors/gtp/Makefile.am +++ b/src/service_inspectors/gtp/Makefile.am @@ -17,9 +17,9 @@ noinst_LIBRARIES = libgtp_inspect.a libgtp_inspect_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libgtp_inspect.la -libgtp_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libgtp_inspect_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libgtp_inspect_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = gtp_inspect.la +gtp_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +gtp_inspect_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +gtp_inspect_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/http_inspect/CMakeLists.txt b/src/service_inspectors/http_inspect/CMakeLists.txt index 756dc7792..a51c22be6 100644 --- a/src/service_inspectors/http_inspect/CMakeLists.txt +++ b/src/service_inspectors/http_inspect/CMakeLists.txt @@ -68,7 +68,7 @@ set (FILE_LIST add_library(http_inspect STATIC ${FILE_LIST}) #else(STATIC_INSPECTORS) - #add_shared_library(http_inspect inspectors ${FILE_LIST}) + #add_dynamic_module(http_inspect inspectors ${FILE_LIST}) #endif(STATIC_INSPECTORS) diff --git a/src/service_inspectors/http_inspect/Makefile.am b/src/service_inspectors/http_inspect/Makefile.am index f0d4db812..857d40fbf 100644 --- a/src/service_inspectors/http_inspect/Makefile.am +++ b/src/service_inspectors/http_inspect/Makefile.am @@ -38,10 +38,10 @@ libhttp_inspect_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libhttp_inspect.la -#libhttp_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libhttp_inspect_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libhttp_inspect_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = http_inspect.la +#http_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#http_inspect_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#http_inspect_la_SOURCES = $(file_list) # #endif diff --git a/src/service_inspectors/imap/CMakeLists.txt b/src/service_inspectors/imap/CMakeLists.txt index ad196edc4..563b5252e 100644 --- a/src/service_inspectors/imap/CMakeLists.txt +++ b/src/service_inspectors/imap/CMakeLists.txt @@ -14,7 +14,7 @@ set( FILE_LIST add_library( imap STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) - #add_shared_library(imap inspectors ${FILE_LIST}) + #add_dynamic_module(imap inspectors ${FILE_LIST}) #endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/imap/Makefile.am b/src/service_inspectors/imap/Makefile.am index 5acceb9b9..614823f08 100644 --- a/src/service_inspectors/imap/Makefile.am +++ b/src/service_inspectors/imap/Makefile.am @@ -14,9 +14,9 @@ noinst_LIBRARIES = libimap.a libimap_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libimap.la -#libimap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libimap_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libimap_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = imap.la +#imap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#imap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#imap_la_SOURCES = $(file_list) #endif diff --git a/src/service_inspectors/modbus/CMakeLists.txt b/src/service_inspectors/modbus/CMakeLists.txt index 9cbd7dc5b..de84949ae 100644 --- a/src/service_inspectors/modbus/CMakeLists.txt +++ b/src/service_inspectors/modbus/CMakeLists.txt @@ -16,7 +16,7 @@ if (STATIC_INSPECTORS) add_library(modbus STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(modbus inspectors ${FILE_LIST}) + add_dynamic_module(modbus inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/modbus/Makefile.am b/src/service_inspectors/modbus/Makefile.am index b3b7655ae..6465e4a4e 100644 --- a/src/service_inspectors/modbus/Makefile.am +++ b/src/service_inspectors/modbus/Makefile.am @@ -17,10 +17,10 @@ noinst_LIBRARIES = libmodbus.a libmodbus_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libmodbus.la -libmodbus_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libmodbus_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libmodbus_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = modbus.la +modbus_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +modbus_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +modbus_la_SOURCES = $(file_list) endif EXTRA_DIST = dev_notes.txt diff --git a/src/service_inspectors/pop/CMakeLists.txt b/src/service_inspectors/pop/CMakeLists.txt index 16016903e..06f86bac6 100644 --- a/src/service_inspectors/pop/CMakeLists.txt +++ b/src/service_inspectors/pop/CMakeLists.txt @@ -14,7 +14,7 @@ set( FILE_LIST add_library( pop STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) - #add_shared_library(pop inspectors ${FILE_LIST}) + #add_dynamic_module(pop inspectors ${FILE_LIST}) #endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/pop/Makefile.am b/src/service_inspectors/pop/Makefile.am index cc9617e44..d10593309 100644 --- a/src/service_inspectors/pop/Makefile.am +++ b/src/service_inspectors/pop/Makefile.am @@ -14,9 +14,9 @@ noinst_LIBRARIES = libpop.a libpop_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libpop.la -#libpop_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libpop_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libpop_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = pop.la +#pop_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#pop_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#pop_la_SOURCES = $(file_list) #endif diff --git a/src/service_inspectors/rpc_decode/CMakeLists.txt b/src/service_inspectors/rpc_decode/CMakeLists.txt index b1b88ee09..86dbc97b7 100644 --- a/src/service_inspectors/rpc_decode/CMakeLists.txt +++ b/src/service_inspectors/rpc_decode/CMakeLists.txt @@ -9,6 +9,6 @@ if (STATIC_INSPECTORS) add_library( rpc_decode STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(rpc_decode inspectors ${FILE_LIST}) + add_dynamic_module(rpc_decode inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/rpc_decode/Makefile.am b/src/service_inspectors/rpc_decode/Makefile.am index b27af9592..dc23aa2af 100644 --- a/src/service_inspectors/rpc_decode/Makefile.am +++ b/src/service_inspectors/rpc_decode/Makefile.am @@ -9,9 +9,9 @@ noinst_LIBRARIES = librpc_decode.a librpc_decode_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = librpc_decode.la -librpc_decode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -librpc_decode_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -librpc_decode_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = rpc_decode.la +rpc_decode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +rpc_decode_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +rpc_decode_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/sip/CMakeLists.txt b/src/service_inspectors/sip/CMakeLists.txt index 2506f93d4..db4aa84a2 100644 --- a/src/service_inspectors/sip/CMakeLists.txt +++ b/src/service_inspectors/sip/CMakeLists.txt @@ -24,6 +24,6 @@ set( FILE_LIST add_library( sip STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) -# add_shared_library(sip inspectors ${FILE_LIST}) +# add_dynamic_module(sip inspectors ${FILE_LIST}) #endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/sip/Makefile.am b/src/service_inspectors/sip/Makefile.am index 3ed76b070..0d803731b 100644 --- a/src/service_inspectors/sip/Makefile.am +++ b/src/service_inspectors/sip/Makefile.am @@ -23,9 +23,9 @@ noinst_LIBRARIES = libsip.a libsip_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libsip.la -#libsip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libsip_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libsip_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = sip.la +#sip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#sip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#sip_la_SOURCES = $(file_list) #endif diff --git a/src/service_inspectors/smtp/CMakeLists.txt b/src/service_inspectors/smtp/CMakeLists.txt index 5ce346d52..6bbd7b957 100644 --- a/src/service_inspectors/smtp/CMakeLists.txt +++ b/src/service_inspectors/smtp/CMakeLists.txt @@ -20,7 +20,7 @@ set( FILE_LIST add_library( smtp STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) - #add_shared_library(smtp inspectors ${FILE_LIST}) + #add_dynamic_module(smtp inspectors ${FILE_LIST}) #endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/smtp/Makefile.am b/src/service_inspectors/smtp/Makefile.am index 57d07450a..fdf7d5a83 100644 --- a/src/service_inspectors/smtp/Makefile.am +++ b/src/service_inspectors/smtp/Makefile.am @@ -20,9 +20,9 @@ noinst_LIBRARIES = libsmtp.a libsmtp_a_SOURCES = $(file_list) #else #shlibdir = $(pkglibdir)/inspectors -#shlib_LTLIBRARIES = libsmtp.la -#libsmtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libsmtp_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -#libsmtp_la_SOURCES = $(file_list) +#shlib_LTLIBRARIES = smtp.la +#smtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +#smtp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +#smtp_la_SOURCES = $(file_list) #endif diff --git a/src/service_inspectors/ssh/CMakeLists.txt b/src/service_inspectors/ssh/CMakeLists.txt index 8afbd6695..b052bbe48 100644 --- a/src/service_inspectors/ssh/CMakeLists.txt +++ b/src/service_inspectors/ssh/CMakeLists.txt @@ -11,6 +11,6 @@ if (STATIC_INSPECTORS) add_library( ssh STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(ssh inspectors ${FILE_LIST}) + add_dynamic_module(ssh inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/ssh/Makefile.am b/src/service_inspectors/ssh/Makefile.am index c3bbf1bf8..de5b3ab7f 100644 --- a/src/service_inspectors/ssh/Makefile.am +++ b/src/service_inspectors/ssh/Makefile.am @@ -11,9 +11,9 @@ noinst_LIBRARIES = libssh.a libssh_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libssh.la -libssh_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libssh_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libssh_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = ssh.la +ssh_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +ssh_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +ssh_la_SOURCES = $(file_list) endif diff --git a/src/service_inspectors/ssl/CMakeLists.txt b/src/service_inspectors/ssl/CMakeLists.txt index 2314f31ea..d91614fbf 100644 --- a/src/service_inspectors/ssl/CMakeLists.txt +++ b/src/service_inspectors/ssl/CMakeLists.txt @@ -14,7 +14,7 @@ set( FILE_LIST add_library( ssl STATIC ${FILE_LIST}) #else (STATIC_INSPECTORS) - #add_shared_library(ssl inspectors ${FILE_LIST}) + #add_dynamic_module(ssl inspectors ${FILE_LIST}) #endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/ssl/Makefile.am b/src/service_inspectors/ssl/Makefile.am index 82395d35a..43309288c 100644 --- a/src/service_inspectors/ssl/Makefile.am +++ b/src/service_inspectors/ssl/Makefile.am @@ -16,7 +16,7 @@ libssl_a_SOURCES = $(file_list) #shlibdir = $(pkglibdir)/inspectors #shlib_LTLIBRARIES = libssl.la #libssl_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -#libssl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared +#libssl_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared #libssl_la_SOURCES = $(file_list) #endif diff --git a/src/service_inspectors/wizard/CMakeLists.txt b/src/service_inspectors/wizard/CMakeLists.txt index ed29ff99a..3833e50d6 100644 --- a/src/service_inspectors/wizard/CMakeLists.txt +++ b/src/service_inspectors/wizard/CMakeLists.txt @@ -15,6 +15,6 @@ if (STATIC_INSPECTORS) add_library(wizard STATIC ${FILE_LIST}) else (STATIC_INSPECTORS) - add_shared_library(wizard inspectors ${FILE_LIST}) + add_dynamic_module(wizard inspectors ${FILE_LIST}) endif (STATIC_INSPECTORS) diff --git a/src/service_inspectors/wizard/Makefile.am b/src/service_inspectors/wizard/Makefile.am index b8c7b33e5..be0fa5da5 100644 --- a/src/service_inspectors/wizard/Makefile.am +++ b/src/service_inspectors/wizard/Makefile.am @@ -13,9 +13,9 @@ noinst_LIBRARIES = libwizard.a libwizard_a_SOURCES = $(file_list) else shlibdir = $(pkglibdir)/inspectors -shlib_LTLIBRARIES = libwizard.la -libwizard_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO -libwizard_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -shared -libwizard_la_SOURCES = $(file_list) +shlib_LTLIBRARIES = wizard.la +wizard_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO +wizard_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared +wizard_la_SOURCES = $(file_list) endif diff --git a/src/utils/util.cc b/src/utils/util.cc index a40898a97..334a991cf 100644 --- a/src/utils/util.cc +++ b/src/utils/util.cc @@ -113,9 +113,7 @@ int DisplayBanner() " All rights reserved.\n"); LogMessage(" Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n"); LogMessage(" Using DAQ version %s\n", daq_version_string()); -#ifdef HAVE_PCAP_LIB_VERSION LogMessage(" Using %s\n", pcap_lib_version()); -#endif LogMessage(" Using LuaJIT version %s\n", ljv); LogMessage(" Using PCRE version %s\n", pcre_version()); LogMessage(" Using ZLIB version %s\n", zlib_version); -- 2.47.2