Fix build of make and asn1 plugins.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30144 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/README.cmake b/README.cmake
index 095d7f85ca8fbe501425ead91cf6968bf0f0d48c..92aff4db6530dc725a0eed6fbf2f498e74e292d6 100644 (file)
--- a/README.cmake
+++ b/README.cmake
@@ -84,8 +84,6 @@ What needs to be done?
 - Test and add support for other platforms (BSDs, OSX,
   Solaris, Win32, Win64, ...)
 ...
-Couldn't load module /opt/test/lib/wireshark/plugins/1.3.0/libasn1.so: /opt/test/lib/wireshark/plugins/1.3.0/libasn1.so: undefined symbol: asn1_bool_decode
-Couldn't load module /opt/test/lib/wireshark/plugins/1.3.0/libmate.so: /opt/test/lib/wireshark/plugins/1.3.0/libmate.so: undefined symbol: mate_load_config
 
 Links regarding cmake
 =====================

diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt
index 028006364072d5f94763e1051b141a78584d96d1..1382369d0ef1a7c647597af88c9883ffebf19a02 100644 (file)
--- a/plugins/asn1/CMakeLists.txt
+++ b/plugins/asn1/CMakeLists.txt
@@ -25,9 +25,14 @@ set(DISSECTOR_SRC
        packet-asn1.c
 )
 
+set(DISSECTOR_SUPPORT_SRC
+       asn1.c
+)
+
 set(PLUGIN_FILES
        plugin.c
        ${DISSECTOR_SRC}
+       ${DISSECTOR_SUPPORT_SRC}
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index c7b121b1cc049c91522e2e158e5732059b679d2b..59b32025588b8559ab04db1bb990b5db732dc0fb 100644 (file)
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -31,12 +31,6 @@ set(DISSECTOR_SUPPORT_SRC
        mate_util.c
 )
 
-set(PLUGIN_FILES
-       plugin.c
-       ${DISSECTOR_SRC}
-       ${DISSECTOR_SUPPORT_SRC}
-)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 #mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT)
@@ -51,6 +45,12 @@ add_lex_files(DISSECTOR_SUPPORT_SRC
        mate_parser.l
 )
 
+set(PLUGIN_FILES
+       plugin.c
+       ${DISSECTOR_SRC}
+       ${DISSECTOR_SUPPORT_SRC}
+)
+
 ADD_CUSTOM_COMMAND(
 # FIXME: Only the Python stuff has been implemented
 #        Make this into a MACRO, to avoid duplication with epan/