From: Joel Cornett <joel.cornett@gmail.com>
Date: Thu, 28 Apr 2016 16:27:03 +0000 (-0400)
Subject: removing BUILDING_SO ifdefs and get daqs to build as -std=gnu99 -module
X-Git-Tag: 3.0.0-233~415^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd2b42f8bfb84ce15e9cef007cfefd69dc8fccce;p=thirdparty%2Fsnort3.git

removing BUILDING_SO ifdefs and get daqs to build as -std=gnu99 -module
---

diff --git a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
index 1c862944c..903ca310b 100644
--- a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
+++ b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
@@ -97,13 +97,8 @@ static const CodecApi i4l_rawip_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &i4l_rawip_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_i4l_rawip = &i4l_rawip_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
index ea6299d96..e1db8c24d 100644
--- a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
+++ b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
@@ -96,13 +96,8 @@ static const CodecApi linux_ssl_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &linux_ssl_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_linux_sll = &linux_ssl_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_null/cd_null.cc b/extra/src/codecs/cd_null/cd_null.cc
index 6cc6e48e9..c9d2bd77e 100644
--- a/extra/src/codecs/cd_null/cd_null.cc
+++ b/extra/src/codecs/cd_null/cd_null.cc
@@ -90,13 +90,8 @@ static const CodecApi null_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &null_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_null = &null_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_pflog/cd_pflog.cc b/extra/src/codecs/cd_pflog/cd_pflog.cc
index 8c8491422..db7760ddd 100644
--- a/extra/src/codecs/cd_pflog/cd_pflog.cc
+++ b/extra/src/codecs/cd_pflog/cd_pflog.cc
@@ -261,13 +261,8 @@ static const CodecApi pflog_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &pflog_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_pflog = &pflog_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_ppp/cd_ppp.cc b/extra/src/codecs/cd_ppp/cd_ppp.cc
index df44b4632..6fc6f3539 100644
--- a/extra/src/codecs/cd_ppp/cd_ppp.cc
+++ b/extra/src/codecs/cd_ppp/cd_ppp.cc
@@ -100,13 +100,8 @@ static const CodecApi ppp_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &ppp_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_ppp = &ppp_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_raw4/cd_raw4.cc b/extra/src/codecs/cd_raw4/cd_raw4.cc
index 362272124..795cd8c47 100644
--- a/extra/src/codecs/cd_raw4/cd_raw4.cc
+++ b/extra/src/codecs/cd_raw4/cd_raw4.cc
@@ -87,13 +87,8 @@ static const CodecApi raw4_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &raw4_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_raw4 = &raw4_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_raw6/cd_raw6.cc b/extra/src/codecs/cd_raw6/cd_raw6.cc
index f6357ab60..2175bc645 100644
--- a/extra/src/codecs/cd_raw6/cd_raw6.cc
+++ b/extra/src/codecs/cd_raw6/cd_raw6.cc
@@ -84,13 +84,8 @@ static const CodecApi raw6_api =
     dtor, // dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &raw6_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_raw6 = &raw6_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_slip/cd_slip.cc b/extra/src/codecs/cd_slip/cd_slip.cc
index e92bcbc60..16e28c2b6 100644
--- a/extra/src/codecs/cd_slip/cd_slip.cc
+++ b/extra/src/codecs/cd_slip/cd_slip.cc
@@ -91,13 +91,8 @@ static const CodecApi slip_api =
     dtor
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &slip_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_slip = &slip_api.base;
-#endif
-
diff --git a/extra/src/codecs/cd_wlan/cd_wlan.cc b/extra/src/codecs/cd_wlan/cd_wlan.cc
index b15d4498f..2eb378d70 100644
--- a/extra/src/codecs/cd_wlan/cd_wlan.cc
+++ b/extra/src/codecs/cd_wlan/cd_wlan.cc
@@ -194,13 +194,8 @@ static const CodecApi wlan_api =
     dtor,
 };
 
-#ifdef BUILDING_SO
 SO_PUBLIC const BaseApi* snort_plugins[] =
 {
     &wlan_api.base,
     nullptr
 };
-#else
-const BaseApi* cd_wlan = &wlan_api.base;
-#endif
-
diff --git a/extra/src/daqs/daq_socket/CMakeLists.txt b/extra/src/daqs/daq_socket/CMakeLists.txt
index c54be559a..740958543 100644
--- a/extra/src/daqs/daq_socket/CMakeLists.txt
+++ b/extra/src/daqs/daq_socket/CMakeLists.txt
@@ -4,8 +4,8 @@ project ( daq_socket C )
 if ( APPLE )
     set ( CMAKE_MACOSX_RPATH OFF )
     set (
-        CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup"
+        CMAKE_MODULE_LINKER_FLAGS
+        "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup"
     )
 endif ( APPLE )
 
@@ -13,10 +13,12 @@ include ( FindPkgConfig )
 pkg_search_module ( SNORT3 REQUIRED snort>=3 )
 
 add_library (
-    daq_socket SHARED
+    daq_socket MODULE
     daq_socket.c
 )
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
 target_include_directories (
     daq_socket PUBLIC
     ${SNORT3_INCLUDE_DIRS}
diff --git a/extra/src/daqs/daq_socket/Makefile.am b/extra/src/daqs/daq_socket/Makefile.am
index 7a2a95780..c188f586c 100644
--- a/extra/src/daqs/daq_socket/Makefile.am
+++ b/extra/src/daqs/daq_socket/Makefile.am
@@ -1,8 +1,9 @@
 daq_socketlibdir = $(pkglibdir)/daqs
 
-AM_CFLAGS   = @SNORT3_CFLAGS@
+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
diff --git a/extra/src/daqs/daq_socket/daq_socket.c b/extra/src/daqs/daq_socket/daq_socket.c
index 89f4840d0..64e3e4d8a 100644
--- a/extra/src/daqs/daq_socket/daq_socket.c
+++ b/extra/src/daqs/daq_socket/daq_socket.c
@@ -566,11 +566,7 @@ static int socket_daq_set_filter (void* handle, const char* filter)
 
 //-------------------------------------------------------------------------
 
-#ifdef BUILDING_SO
 DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
-#else
-DAQ_Module_t socket_daq_module_data =
-#endif
 {
     .api_version = DAQ_API_VERSION,
     .module_version = DAQ_MOD_VERSION,
@@ -598,4 +594,3 @@ DAQ_Module_t socket_daq_module_data =
     .hup_apply = NULL,
     .hup_post = NULL,
 };
-
diff --git a/extra/templates/CMakeLists.txt.erb b/extra/templates/CMakeLists.txt.erb
index c9dcb70c1..e451d3752 100644
--- a/extra/templates/CMakeLists.txt.erb
+++ b/extra/templates/CMakeLists.txt.erb
@@ -8,8 +8,13 @@ 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
@@ -18,7 +23,11 @@ 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
@@ -27,6 +36,10 @@ add_library (
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 %end
+%if @project.language == "C"
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+%end
 
 target_include_directories (
     <%= @project.libname %> PUBLIC
diff --git a/extra/templates/Makefile.am.erb b/extra/templates/Makefile.am.erb
index 54a1cfb6e..bd72baa98 100644
--- a/extra/templates/Makefile.am.erb
+++ b/extra/templates/Makefile.am.erb
@@ -3,17 +3,20 @@
 
 %if @project.language == "CXX"
 AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-%else
-AM_CFLAGS   = @SNORT3_CFLAGS@
+%elsif @project.language == "C"
+AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
 %end
 
 <%= @project.libname %>lib_LTLIBRARIES = lib<%= @project.libname %>.la
 %if @project.language == "CXX"
 lib<%= @project.libname %>_la_CXXFLAGS = $(AM_CXXFLAGS)
-%else
+%elsif @project.language == "C"
 lib<%= @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 %>
 %end
 %if !@project.scripts.empty?