diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-30 14:36:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-30 21:37:34 +0000 |
| commit | 5e283865403d02c4a1139ad70eabeb2c35d6a88d (patch) | |
| tree | 0a0770ffe72b2c47beb2662fd858644e27884ad3 /epan | |
| parent | f1ff6635a8356e0832350fd806cc3810132b2102 (diff) | |
Move stat_menu.h to libui.
Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d
Reviewed-on: https://code.wireshark.org/review/2726
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/funnel.h | 2 | ||||
| -rw-r--r-- | epan/stats_tree.h | 2 | ||||
| -rw-r--r-- | epan/wslua/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 2 | ||||
| -rwxr-xr-x | epan/wslua/make-init-lua.pl | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/epan/funnel.h b/epan/funnel.h index f4f4adeab6..b2878427fa 100644 --- a/epan/funnel.h +++ b/epan/funnel.h @@ -27,7 +27,7 @@ #define _FUNNEL_H #include <glib.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ws_symbol_export.h" typedef struct _funnel_progress_window_t funnel_progress_window_t ; diff --git a/epan/stats_tree.h b/epan/stats_tree.h index 27056fe5f3..8f98ed2ce6 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -27,7 +27,7 @@ #include <epan/epan.h> #include <epan/packet_info.h> #include <epan/tap.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "../register.h" #include "ws_symbol_export.h" diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index 8707eaa67b..ca919b8572 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -33,10 +33,10 @@ set(WSLUA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_pinfo.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_listener.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_gui.c - ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c + ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_util.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_field.c - ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c + ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_struct.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dumper.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_internals.c @@ -106,7 +106,7 @@ ADD_CUSTOM_COMMAND( ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h ${CMAKE_SOURCE_DIR}/wiretap/wtap.h ${CMAKE_SOURCE_DIR}/epan/epan.h - ${CMAKE_SOURCE_DIR}/stat_menu.h + ${CMAKE_SOURCE_DIR}/ui/stat_menu.h ) add_custom_target( diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 29d0f71b75..7e677dbec1 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -122,7 +122,7 @@ declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c dummy: touch dummy -init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../stat_menu.h +init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../ui/stat_menu.h $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index 29df74019f..336d6670bd 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -212,7 +212,7 @@ close PROTO_H; $menu_groups .= "-- menu groups for register_menu\n"; my $menu_i = 0; -open STAT_MENU, "< $WSROOT/stat_menu.h" or die "cannot open '$WSROOT/stat_menu.h': $!"; +open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h': $!"; my $foundit = 0; while(<STAT_MENU>) { # need to skip matching words in comments, and get to the enum |