From: Russ Combs <rucombs@cisco.com>
Date: Mon, 30 Jun 2014 13:49:37 +0000 (-0400)
Subject: updated cmake foo
X-Git-Tag: 3.0.0-233~1455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043bc18be0099f0c087fc64656f662c4dcc89b67;p=thirdparty%2Fsnort3.git

updated cmake foo
---

diff --git a/src/codecs/ip/CMakeLists.txt b/src/codecs/ip/CMakeLists.txt
index 116c1debb..b9306bb9d 100644
--- a/src/codecs/ip/CMakeLists.txt
+++ b/src/codecs/ip/CMakeLists.txt
@@ -25,7 +25,7 @@ if( STATIC_CODECS )
         cd_swipe.cc
     )
 
-else()
+else(STATIC_CODECS)
     add_shared_library(cd_ah codecs cd_ah.cc cd_ah_module.h cd_ah_module.cc)
     add_shared_library(cd_dstopts codecs cd_dstopts.cc ipv6_util.h ipv6_util.cc)
     add_shared_library(cd_frag codecs cd_frag.cc ipv6_util.h ipv6_util.cc)
@@ -39,7 +39,7 @@ else()
     add_shared_library(cd_sun_nd codecs cd_sun_nd.cc)
     add_shared_library(cd_swipe codecs cd_swipe.cc)
 
-endif()
+endif(STATIC_CODECS)
 
 
 add_library( ip_codecs STATIC
diff --git a/src/codecs/link/CMakeLists.txt b/src/codecs/link/CMakeLists.txt
index ecd03d492..730c9533e 100644
--- a/src/codecs/link/CMakeLists.txt
+++ b/src/codecs/link/CMakeLists.txt
@@ -30,9 +30,9 @@ if( STATIC_CODECS )
             cd_eapol_module.h
             cd_eapol_module.cc
         )
-    endif()
+    endif(ENABLE_NON_ETHER_DECODERS)
 
-else()
+else(STATIC_CODECS)
     add_shared_library(cd_erspan2 codecs cd_erspan2.cc cd_erspan2_module.h cd_erspan2_module.cc)
     add_shared_library(cd_erspan3 codecs cd_erspan3.cc cd_erspan3_module.h cd_erspan3_module.cc)
     add_shared_library(cd_ethloopback codecs cd_ethloopback.cc)
@@ -44,9 +44,9 @@ else()
 
     if(ENABLE_NON_ETHER_DECODERS)
         add_shared_library(cd_eapol codecs cd_eapol.cc cd_eapol_module.h cd_eapol_module.cc)
-    endif()
+    endif(ENABLE_NON_ETHER_DECODERS)
 
-endif()
+endif(STATIC_CODECS)
 
 
 add_library( link_codecs STATIC
diff --git a/src/codecs/misc/CMakeLists.txt b/src/codecs/misc/CMakeLists.txt
index 780f4d83e..b61902a14 100644
--- a/src/codecs/misc/CMakeLists.txt
+++ b/src/codecs/misc/CMakeLists.txt
@@ -8,11 +8,11 @@ if(STATIC_CODECS)
         cd_teredo.cc
     )
 
-else()
+else(STATIC_CODECS)
     add_shared_library(cd_gtp codecs cd_gtp.cc cd_gtp_module.h cd_gtp_module.cc)
     add_shared_library(cd_teredo codecs cd_teredo.cc)
 
-endif()
+endif(STATIC_CODECS)
 
 add_library( misc_codecs STATIC
     cd_default.cc
diff --git a/src/codecs/root/CMakeLists.txt b/src/codecs/root/CMakeLists.txt
index c03632700..1c9936c60 100644
--- a/src/codecs/root/CMakeLists.txt
+++ b/src/codecs/root/CMakeLists.txt
@@ -25,13 +25,13 @@ if (STATIC_CODECS)
             )
     endif (ENABLE_NON_ETHER_DECODERS)
 
-else()
+else(STATIC_CODECS)
 
     if (ENABLE_NON_ETHER_DECODERS)
         add_shared_library(cd_wlan codecs cd_wlan.cc cd_wlan_module.h cd_wlan_module.cc)
         add_shared_library(cd_linux_sll codecs cd_linux_sll.cc)
-    endif()
-endif()
+    endif(ENABLE_NON_ETHER_DECODERS)
+endif(STATIC_CODECS)
 
 
 add_library(root_codecs STATIC
diff --git a/src/network_inspectors/arp_spoof/CMakeLists.txt b/src/network_inspectors/arp_spoof/CMakeLists.txt
index 8c1b803b1..8ccb338b5 100644
--- a/src/network_inspectors/arp_spoof/CMakeLists.txt
+++ b/src/network_inspectors/arp_spoof/CMakeLists.txt
@@ -10,7 +10,7 @@ if (STATIC_INSPECTORS)
         ${FILE_LIST}
     )
 
-else ()
+else (STATIC_INSPECTORS)
     add_shared_library(arpspoof inspectors ${FILE_LIST})
     
-endif ()
\ No newline at end of file
+endif (STATIC_INSPECTORS)
diff --git a/src/network_inspectors/binder/CMakeLists.txt b/src/network_inspectors/binder/CMakeLists.txt
new file mode 100644
index 000000000..2f758de9b
--- /dev/null
+++ b/src/network_inspectors/binder/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+set(FILE_LIST
+    binder.cc
+    binder.h 
+    bind_module.cc
+    bind_module.h
+)
+
+#if (STATIC_INSPECTORS)
+    add_library(binder STATIC ${FILE_LIST})
+
+#else (STATIC_INSPECTORS)
+#    add_shared_library(binder inspectors ${FILE_LIST})
+#    
+#endif (STATIC_INSPECTORS)
diff --git a/src/network_inspectors/perf_monitor/CMakeLists.txt b/src/network_inspectors/perf_monitor/CMakeLists.txt
index 0610cc922..5a7071ad4 100644
--- a/src/network_inspectors/perf_monitor/CMakeLists.txt
+++ b/src/network_inspectors/perf_monitor/CMakeLists.txt
@@ -6,7 +6,7 @@ if( BUILD_PROCPIDSTATS )
         sfprocpidstats.h
     )
 
-endif()
+endif(BUILD_PROCPIDSTATS)
 
 
 add_library ( perf_monitor STATIC
diff --git a/src/network_inspectors/port_scan/CMakeLists.txt b/src/network_inspectors/port_scan/CMakeLists.txt
index fca8af667..3bb93e427 100644
--- a/src/network_inspectors/port_scan/CMakeLists.txt
+++ b/src/network_inspectors/port_scan/CMakeLists.txt
@@ -21,7 +21,7 @@ if (STATIC_INSPECTORS)
     )
 
 
-else ()
+else (STATIC_INSPECTORS)
     add_shared_library(port_scan inspectors "${FILE_LIST}")
 
 endif (STATIC_INSPECTORS)
diff --git a/src/service_inspectors/back_orifice/CMakeLists.txt b/src/service_inspectors/back_orifice/CMakeLists.txt
index a3286964b..1f657bf0b 100644
--- a/src/service_inspectors/back_orifice/CMakeLists.txt
+++ b/src/service_inspectors/back_orifice/CMakeLists.txt
@@ -6,7 +6,7 @@ set( FILE_LIST
 if (STATIC_INSPECTORS)
     add_library( back_orifice STATIC ${FILE_LIST})
 
-else ()
+else (STATIC_INSPECTORS)
     add_shared_library(back_orifice inspectors ${FILE_LIST})
 
-endif ()
+endif (STATIC_INSPECTORS)
diff --git a/src/service_inspectors/ftp_telnet/CMakeLists.txt b/src/service_inspectors/ftp_telnet/CMakeLists.txt
index 885a6a9d1..fbe13eee0 100644
--- a/src/service_inspectors/ftp_telnet/CMakeLists.txt
+++ b/src/service_inspectors/ftp_telnet/CMakeLists.txt
@@ -39,16 +39,12 @@ set (FILE_LIST
     telnet_module.h
 )
 
-
 if (STATIC_INSPECTORS)
     add_library(ftp_telnet STATIC ${FILE_LIST})
-    target_link_libraries(ftp_telnet
-        utils
-    )
+    target_link_libraries(ftp_telnet utils)
 
-else ()
+else (STATIC_INSPECTORS)
    add_shared_library(ftp_telnet inspectors ${FILE_LIST})
 
-endif ()
-
+endif (STATIC_INSPECTORS)
 
diff --git a/src/service_inspectors/nhttp_inspect/CMakeLists.txt b/src/service_inspectors/nhttp_inspect/CMakeLists.txt
index a196af48c..b8b412420 100644
--- a/src/service_inspectors/nhttp_inspect/CMakeLists.txt
+++ b/src/service_inspectors/nhttp_inspect/CMakeLists.txt
@@ -40,8 +40,9 @@ set (FILE_LIST
     nhttp_stream_splitter.h
 )
 
-#if (STATIC_INSPECTORS)
+if (STATIC_INSPECTORS)
     add_library(nhttp_inspect STATIC ${FILE_LIST})
-#else()
-#    add_shared_library(nhttp_inspect inspectors ${FILE_LIST})
-#endif()
+else(STATIC_INSPECTORS)
+    add_shared_library(nhttp_inspect inspectors ${FILE_LIST})
+endif(STATIC_INSPECTORS)
+
diff --git a/src/service_inspectors/rpc_decode/CMakeLists.txt b/src/service_inspectors/rpc_decode/CMakeLists.txt
index 56c000c50..f1cac7172 100644
--- a/src/service_inspectors/rpc_decode/CMakeLists.txt
+++ b/src/service_inspectors/rpc_decode/CMakeLists.txt
@@ -8,8 +8,8 @@ set( FILE_LIST
 if (STATIC_INSPECTORS)
     add_library( rpc_decode STATIC ${FILE_LIST})
 
-else ()
+else (STATIC_INSPECTORS)
     add_shared_library(rpc_decode inspectors ${FILE_LIST})
 
-endif ()
+endif (STATIC_INSPECTORS)
 
diff --git a/src/service_inspectors/wizard/CMakeLists.txt b/src/service_inspectors/wizard/CMakeLists.txt
new file mode 100644
index 000000000..f7c8eb026
--- /dev/null
+++ b/src/service_inspectors/wizard/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+set(FILE_LIST
+    wizard.cc
+    wizard.h
+    wiz_module.cc
+    wiz_module.h
+)
+
+#if (STATIC_INSPECTORS)
+    add_library(wizard STATIC ${FILE_LIST})
+
+#else (STATIC_INSPECTORS)
+#    add_shared_library(wizard inspectors ${FILE_LIST})
+#    
+#endif (STATIC_INSPECTORS)
+