From 537b083e028c636b8f8afc4a847e186f4abca59f Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 10 Aug 2017 10:20:30 -0700 Subject: Sync some CMake and Autotools install behaviors. Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/dcerpc/CMakeLists.txt | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'epan/dissectors/dcerpc') diff --git a/epan/dissectors/dcerpc/CMakeLists.txt b/epan/dissectors/dcerpc/CMakeLists.txt index 7ff0f5d678..0b044e1352 100644 --- a/epan/dissectors/dcerpc/CMakeLists.txt +++ b/epan/dissectors/dcerpc/CMakeLists.txt @@ -25,25 +25,6 @@ set(PIDL_DISSECTOR_NAMES drsuapi ) -set(IDL2WRS_FILES - idl2wrs.c -) - -set(CLEAN_FILES - ${IDL2WRS_FILES} -) - -set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" -) - -add_executable(idl2wrs ${IDL2WRS_FILES}) -set_target_properties(idl2wrs PROPERTIES FOLDER "Executables") - -target_link_libraries(idl2wrs ${GLIB2_LIBRARIES} wsutil) - foreach(PROTOCOL_NAME IN LISTS PIDL_DISSECTOR_NAMES) # Use a stamp file instead of OUTPUT to packet-dcerpc-X.c to # avoid removing the .c file on clean. -- cgit v1.2.3