From: Josh <jrosenba@cisco.com>
Date: Wed, 25 Jun 2014 15:01:18 +0000 (-0400)
Subject: fixing Makefile problems
X-Git-Tag: 3.0.0-233~1463^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=216b311fc72d11504201623cdfca51e06e8887d9;p=thirdparty%2Fsnort3.git

fixing Makefile problems
---

diff --git a/extra/configure.ac b/extra/configure.ac
index 6a2df6511..9cb77a9cc 100644
--- a/extra/configure.ac
+++ b/extra/configure.ac
@@ -68,6 +68,7 @@ AC_SUBST(AM_CPPFLAGS)
 AC_CONFIG_FILES([ \
     Makefile \
     src/Makefile \
+    src/codecs/Makefile \
     src/inspectors/Makefile \
     src/ips_options/Makefile \
     src/loggers/Makefile \
diff --git a/extra/src/Makefile.am b/extra/src/Makefile.am
index 65874e9cb..8481a3813 100644
--- a/extra/src/Makefile.am
+++ b/extra/src/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS=foreign
 
 SUBDIRS = \
+codecs \
 inspectors \
 ips_options \
 loggers \
diff --git a/src/codecs/codec_api.cc b/src/codecs/codec_api.cc
index ed1d15686..6a52e7031 100644
--- a/src/codecs/codec_api.cc
+++ b/src/codecs/codec_api.cc
@@ -58,7 +58,6 @@ extern const BaseApi* cd_igmp;
 extern const BaseApi* cd_mobility;
 extern const BaseApi* cd_mpls;
 extern const BaseApi* cd_no_next;
-extern const BaseApi* cd_pim;
 extern const BaseApi* cd_pgm;
 extern const BaseApi* cd_pppencap;
 extern const BaseApi* cd_pppoepkt_disc;
@@ -73,7 +72,6 @@ extern const BaseApi* cd_vlan;
 #ifndef NO_NON_ETHER_DECODER
 extern const BaseApi* cd_eapol;
 extern const BaseApi* cd_linux_sll;
-extern const BaseApi* cd_tr;
 extern const BaseApi* cd_wlan;
 
 #endif
@@ -113,7 +111,6 @@ const BaseApi* codecs[] =
     cd_mobility,
     cd_mpls,
     cd_no_next,
-    cd_pim,
     cd_pgm,
     cd_pppencap,
     cd_pppoepkt_disc,
@@ -128,7 +125,6 @@ const BaseApi* codecs[] =
 #ifndef NO_NON_ETHER_DECODER
     cd_eapol,
     cd_linux_sll,
-    cd_tr,
     cd_wlan,
 #endif
 
diff --git a/src/codecs/codec_events.h b/src/codecs/codec_events.h
index 79b0e8ea5..d6c3bc581 100644
--- a/src/codecs/codec_events.h
+++ b/src/codecs/codec_events.h
@@ -27,13 +27,13 @@
 namespace codec_events
 {
 
-    void exec_ip_chksm_drop(Packet*);
-    void exec_udp_chksm_drop (Packet*);
-    void exec_tcp_chksm_drop (Packet*);
-    void exec_icmp_chksm_drop (Packet*);
-    void decoder_event(Packet* p, CodecSid);
-    void decoder_alert_encapsulated(
-        Packet*, CodecSid, const uint8_t* pkt, uint32_t len);
+void exec_ip_chksm_drop(Packet*);
+void exec_udp_chksm_drop (Packet*);
+void exec_tcp_chksm_drop (Packet*);
+void exec_icmp_chksm_drop (Packet*);
+void decoder_event(Packet* p, CodecSid);
+void decoder_alert_encapsulated(
+    Packet*, CodecSid, const uint8_t* pkt, uint32_t len);
 
 
 } //namespace codec_events
diff --git a/src/codecs/ip/Makefile.am b/src/codecs/ip/Makefile.am
index 351bf7884..8c764cebe 100644
--- a/src/codecs/ip/Makefile.am
+++ b/src/codecs/ip/Makefile.am
@@ -43,7 +43,6 @@ cd_igmp_module.h \
 cd_igmp_module.cc \
 cd_mobility.cc \
 cd_no_next.cc \
-cd_pim.cc \
 cd_pgm.cc \
 cd_pgm_module.h \
 cd_pgm_module.cc \
@@ -84,11 +83,6 @@ libcd_pgm_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
 libcd_pgm_la_LDFLAGS = -export-dynamic -shared
 libcd_pgm_la_SOURCES = cd_pgm.cc cd_pgm_module.h cd_pgm_module.cc
 
-ehlib_LTLIBRARIES += libcd_pim.la
-libcd_pim_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-libcd_pim_la_LDFLAGS = -export-dynamic -shared
-libcd_pim_la_SOURCES = cd_pim.cc
-
 ehlib_LTLIBRARIES += libcd_sun_nd.la
 libcd_sun_nd_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
 libcd_sun_nd_la_LDFLAGS = -export-dynamic -shared
diff --git a/src/codecs/root/Makefile.am b/src/codecs/root/Makefile.am
index 5535f8ba0..90e484b11 100644
--- a/src/codecs/root/Makefile.am
+++ b/src/codecs/root/Makefile.am
@@ -15,9 +15,6 @@ if ENABLE_NON_ETHER_DECODER
 if STATIC_CODECS
 libroot_codecs_a_SOURCES += \
 cd_linux_sll.cc \
-cd_tr.cc \
-cd_tr_module.h \
-cd_tr_module.cc \
 cd_wlan.cc \
 cd_wlan_module.h \
 cd_wlan_module.cc
@@ -37,12 +34,7 @@ cd_wlan_module.cc
 else
 ehlibdir = $(pkglibdir)/codecs
 
-ehlib_LTLIBRARIES = libcd_tr.la
-libcd_tr_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-libcd_tr_la_LDFLAGS = -export-dynamic -shared
-libcd_tr_la_SOURCES = cd_tr.cc cd_tr_module.h cd_tr_module.cc
-
-ehlib_LTLIBRARIES += libcd_wlan.la
+ehlib_LTLIBRARIES = libcd_wlan.la
 libcd_wlan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
 libcd_wlan_la_LDFLAGS = -export-dynamic -shared
 libcd_wlan_la_SOURCES =  cd_wlan.cc cd_wlan_module.h cd_wlan_module.cc