aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/dcerpc
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-08-10 10:20:30 -0700
committerMichael Mann <mmann78@netscape.net>2017-08-12 13:53:59 +0000
commit537b083e028c636b8f8afc4a847e186f4abca59f (patch)
treee46fdbe05f81b850d6f31d125e5353d558d4e906 /epan/dissectors/dcerpc
parentdc2a2424b48086ac2f79abc322070a4498d01607 (diff)
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 <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/dcerpc')
-rw-r--r--epan/dissectors/dcerpc/CMakeLists.txt19
1 files changed, 0 insertions, 19 deletions
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.