diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/funnel.h | 2 | ||||
| -rw-r--r-- | epan/stats_tree.h | 2 | ||||
| -rw-r--r-- | epan/wslua/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 2 | ||||
| -rwxr-xr-x | epan/wslua/make-init-lua.pl | 8 |
6 files changed, 9 insertions, 8 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index f5991c91f7..1707635e29 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -238,6 +238,7 @@ LIBWIRESHARK_INCLUDES = \ sminmpec.h \ sna-utils.h \ stat_cmd_args.h \ + stat_groups.h \ stats_tree.h \ stats_tree_priv.h \ stream.h \ diff --git a/epan/funnel.h b/epan/funnel.h index b2878427fa..2b2282ab75 100644 --- a/epan/funnel.h +++ b/epan/funnel.h @@ -27,7 +27,7 @@ #define _FUNNEL_H #include <glib.h> -#include "ui/stat_menu.h" +#include <epan/stat_groups.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 8f98ed2ce6..0efa1c7349 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 "ui/stat_menu.h" +#include <epan/stat_groups.h> #include "../register.h" #include "ws_symbol_export.h" diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index ca919b8572..6bb30756d7 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -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}/ui/stat_menu.h + ${CMAKE_SOURCE_DIR}/epan/stat_groups.h ) add_custom_target( diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 7e677dbec1..85203ced2d 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 ../../ui/stat_menu.h +init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../stat_groups.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 336d6670bd..082fb5264d 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -204,7 +204,7 @@ while(<PROTO_H>) { close PROTO_H; # -# Extract values from stat_menu.h: +# Extract values from stat_groups.h: # # MENU_X_X values for register_stat_group_t # @@ -212,9 +212,9 @@ close PROTO_H; $menu_groups .= "-- menu groups for register_menu\n"; my $menu_i = 0; -open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h': $!"; +open STAT_GROUPS, "< $WSROOT/epan/stat_groups.h" or die "cannot open '$WSROOT/epan/stat_groups.h': $!"; my $foundit = 0; -while(<STAT_MENU>) { +while(<STAT_GROUPS>) { # need to skip matching words in comments, and get to the enum if (/^typedef enum {/) { $foundit = 1; } # the problem here is we need to pick carefully, so we don't break existing scripts @@ -224,7 +224,7 @@ while(<STAT_MENU>) { $menu_i++; } } -close STAT_MENU; +close STAT_GROUPS; $bases_table .= "}\n\n"; |