Make the cosnaming dissector a builtin dissector.

svn path=/trunk/; revision=42968

epan/CMakeLists.txt

@@ -427,6 +427,7 @@ set(DISSECTOR_SRC
 	dissectors/packet-componentstatus.c
 	dissectors/packet-cops.c
 	dissectors/packet-cosine.c
+	dissectors/packet-cosnaming.c
 	dissectors/packet-cpfi.c
 	dissectors/packet-cpha.c
 	dissectors/packet-csm-encaps.c

epan/dissectors/Makefile.common

@@ -347,6 +347,7 @@ DISSECTOR_SRC = \
 	packet-componentstatus.c \
 	packet-cops.c		\
 	packet-cosine.c		\
+	packet-cosnaming.c	\
 	packet-cpfi.c		\
 	packet-cpha.c		\
 	packet-csm-encaps.c	\

plugins/giop/CMakeLists.txt

@@ -21,16 +21,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-set(COSNAMING_SRC
-	packet-cosnaming.c
-)
-
 set(COSEVENTCOMM_SRC
 	packet-coseventcomm.c
 )
 
 set(CLEAN_FILES
-	${COSNAMING_SRC}
 	${COSEVENTCOMM_SRC}
 )
 
@@ -44,20 +39,6 @@ endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(cosnaming ${LINK_MODE_MODULE}
-	${COSNAMING_SRC}
-)
-set_target_properties(cosnaming PROPERTIES PREFIX "")
-set_target_properties(cosnaming PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-
-target_link_libraries(cosnaming epan)
-
-install(TARGETS cosnaming
-	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}
-)
-
 add_library(coseventcomm ${LINK_MODE_MODULE}
 	${COSEVENTCOMM_SRC}
 )

plugins/giop/Makefile.common

@@ -29,8 +29,7 @@ PLUGIN_NAME = giop
 
 # the dissector sources (without any helpers)
 DISSECTOR_SRC = \
-	packet-coseventcomm.c \
-	packet-cosnaming.c
+	packet-coseventcomm.c
 
 # corresponding headers
 DISSECTOR_INCLUDES =