aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-12 21:13:00 +0000
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-12 21:13:00 +0000
commit3ba728fd3d26ced3bf100377b4a73f3da580deb2 (patch)
tree457b4c51f03e94db2be21802f983dfd2be2adc6c /gtk
parentc2bc525e2ffb2c02a683e6b34b1bf7e910c2889b (diff)
Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread - gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1 - Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..." git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37103 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r--gtk/CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 10a34c6a32..7f02d21d5a 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -77,7 +77,7 @@ set(WIRESHARK_GTK_SRC
main_welcome.c
manual_addr_resolv.c
mcast_stream.c
- menus.c
+ # menus.c
new_packet_list.c
packet_history.c
packet_list_store.c
@@ -150,7 +150,6 @@ set(WIRESHARK_TAP_SRC
fc_stat.c
flow_graph.c
funnel_stat.c
- gsm_a_stat.c
gsm_map_stat.c
gsm_map_summary.c
gtp_stat.c
@@ -224,6 +223,11 @@ if (UI_MANAGER)
-DMAIN_MENU_USE_UIMANAGER=1
)
endif()
+if (WANT_PACKET_EDITOR)
+ add_definitions(
+ -DWANT_PACKET_EDITOR=1
+ )
+endif()
register_tap_files(wireshark-tap-register.c
${WIRESHARK_TAP_SRC}
@@ -231,6 +235,8 @@ register_tap_files(wireshark-tap-register.c
add_library(ui STATIC
${WIRESHARK_GTK_SRC}
+ gsm_a_stat.c
+ menus.c
${WIRESHARK_TAP_SRC}
wireshark-tap-register.c
)