diff options
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-tango.c (renamed from plugins/giop/packet-tango.c) | 0 | ||||
| -rw-r--r-- | plugins/giop/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | plugins/giop/Makefile.common | 3 |
5 files changed, 3 insertions, 20 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 98bc389f27..7acc477d9e 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -282,6 +282,7 @@ set(DIRTY_ASN1_DISSECTOR_SRC dissectors/packet-snmp.c dissectors/packet-t124.c dissectors/packet-t125.c + dissectors/packet-tango.c dissectors/packet-tcap.c dissectors/packet-tetra.c ) diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 56e81ec4a6..ba2edf75b1 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -198,6 +198,7 @@ DIRTY_ASN1_DISSECTOR_SRC = \ packet-snmp.c \ packet-t124.c \ packet-t125.c \ + packet-tango.c \ packet-tcap.c \ packet-tetra.c \ $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC) diff --git a/plugins/giop/packet-tango.c b/epan/dissectors/packet-tango.c index 7609c704d8..7609c704d8 100644 --- a/plugins/giop/packet-tango.c +++ b/epan/dissectors/packet-tango.c diff --git a/plugins/giop/CMakeLists.txt b/plugins/giop/CMakeLists.txt index 43d4bb7b27..ce560f1c53 100644 --- a/plugins/giop/CMakeLists.txt +++ b/plugins/giop/CMakeLists.txt @@ -29,14 +29,9 @@ set(COSEVENTCOMM_SRC packet-coseventcomm.c ) -set(TANGO_SRC - packet-tango.c -) - set(CLEAN_FILES ${COSNAMING_SRC} ${COSEVENTCOMM_SRC} - # Not clean ${TANGO_SRC} ) if (WERROR) @@ -77,17 +72,4 @@ install(TARGETS coseventcomm ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} ) -add_library(tango ${LINK_MODE_MODULE} - ${TANGO_SRC} -) -set_target_properties(tango PROPERTIES PREFIX "") -set_target_properties(tango PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") - -target_link_libraries(tango epan) - -install(TARGETS tango - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} NAMELINK_SKIP - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} -) diff --git a/plugins/giop/Makefile.common b/plugins/giop/Makefile.common index f0f1c360b7..02c1914831 100644 --- a/plugins/giop/Makefile.common +++ b/plugins/giop/Makefile.common @@ -30,8 +30,7 @@ PLUGIN_NAME = giop # the dissector sources (without any helpers) DISSECTOR_SRC = \ packet-coseventcomm.c \ - packet-cosnaming.c \ - packet-tango.c + packet-cosnaming.c # corresponding headers DISSECTOR_INCLUDES = |