diff options
32 files changed, 88 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index 8d41d8509a..2390286d15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1218,7 +1218,8 @@ dumpabi: $(MAKE) -C wsutil dumpabi-libwsutil checkapi_local: - $(PERL) tools/checkAPIs.pl -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -build \ + -sourcedir=$(srcdir) \ $(TSHARK_TAP_SRC) \ $(wireshark_SOURCES) # $(EXTRA_wireshark_SOURCES) diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 4ae0c5516f..2d9698ed86 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -46,7 +46,8 @@ libcodec_a_DEPENDENCIES = AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + -sourcedir=$(srcdir) \ $(LIBCODEC_SRC) EXTRA_DIST = \ diff --git a/epan/Makefile.am b/epan/Makefile.am index 58f622286b..dc54506cd7 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -332,4 +332,6 @@ dumpabi-libwireshark: all abi-descriptor.xml cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: - $(AM_V_GEN)$(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) + $(AM_V_GEN)$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(LIBWIRESHARK_SRC) diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index 091c8d2946..7c781114b3 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -50,5 +50,6 @@ EXTRA_DIST = \ Makefile.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ $(LIBAIRPDCAP_SRC) diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index b851e94d10..81a9b4f690 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -83,6 +83,7 @@ grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/gramma (rm -f grammar.c grammar.h ; false) checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(GENERATOR_FILES) \ - $(NONGENERATED_C_FILES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(GENERATOR_FILES) \ + $(NONGENERATED_C_FILES) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index c2a3175967..80a066c078 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -143,5 +143,6 @@ MAINTAINERCLEANFILES = \ Makefile.in checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) $(DISSECTOR_SUPPORT_SRC) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) $(DISSECTOR_SUPPORT_SRC) diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index 04f344c36a..e0d5df40ed 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -45,5 +45,6 @@ EXTRA_DIST = \ Makefile.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(NONGENERATED_C_FILES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(NONGENERATED_C_FILES) diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index e06d72a4cd..d3aa52d1ae 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -56,7 +56,8 @@ EXTRA_DIST = \ wmem_test.c checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ $(LIBWMEM_SRC) # diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 9c97f0b9b7..29d0f71b75 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -126,7 +126,8 @@ init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wt $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ init_wslua.c \ register_wslua.c \ taps_wslua.c \ diff --git a/filetap/Makefile.am b/filetap/Makefile.am index 17894af2b0..5412b944bd 100644 --- a/filetap/Makefile.am +++ b/filetap/Makefile.am @@ -72,5 +72,7 @@ dumpabi-libfiletap: all abi-descriptor.xml checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error -## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) - $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) +## $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(NONGENERATED_C_FILES) diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am index a44756eb7d..405d9e47e7 100644 --- a/plugins/asn1/Makefile.am +++ b/plugins/asn1/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 3dbc884072..bc53f5d911 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -129,4 +129,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index 06f2dcab96..7a602a88cf 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 85215c48e6..1593e28392 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -130,4 +130,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index a451446354..f83062f2d8 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -134,4 +134,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index d582ce644a..6ba2b773cb 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 4ccd3ea469..64679ff9e9 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -157,4 +157,5 @@ mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT) checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 61f3eed115..43f33fd4ea 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -130,4 +130,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 6c3e995d85..bbe106f61b 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index e1f00b5200..b637e5b3bb 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -62,4 +62,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index 9cad59ccd9..d29b31660b 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -74,4 +74,6 @@ http-parser.c: http.tpg $(TPG)/tpg.pl $(TPG)/TPG.pm $(PERL) -I$(TPG) $(TPG)/tpg.pl http.tpg checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index e38fc2d403..df6d1d1f47 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -130,4 +130,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index b9a8a9dfa8..c6ee98c72b 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 5872459638..1da4282bdc 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -146,4 +146,5 @@ wimaxasncpdir = $(pkgdatadir)/wimaxasncp checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index f7ab241185..17957b1d16 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -128,4 +128,5 @@ EXTRA_DIST = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index de48d6d3ee..4847408ad5 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -1855,6 +1855,7 @@ sub print_usage { print "Usage: checkAPIs.pl [-M] [-h] [-g group1] [-g group2] ... \n"; print " [--build] [-s group1] [-s group2] ... \n"; + print " [--sourcedir=srcdir] \n"; print " [--nocheck-value-string-array] \n"; print " [--nocheck-addtext] [--nocheck-hf] [--debug] file1 file2 ...\n"; print "\n"; @@ -1999,6 +2000,7 @@ my $check_hf = 1; # default: enabled my $check_addtext = 1; # default: enabled my $debug_flag = 0; # default: disabled my $buildbot_flag = 0; +my $source_dir = ""; my $help_flag = 0; my $pre_commit = 0; @@ -2010,6 +2012,7 @@ my $result = GetOptions( 'check-hf!' => \$check_hf, 'check-addtext!' => \$check_addtext, 'build' => \$buildbot_flag, + 'sourcedir=s' => \$source_dir, 'debug' => \$debug_flag, 'pre-commit' => \$pre_commit, 'help' => \$help_flag @@ -2048,6 +2051,9 @@ while ($_ = $ARGV[0]) my @foundAPIs = (); my $line; + if ($source_dir and ! -e $filename) { + $filename = $source_dir . '/' . $filename; + } if (! -e $filename) { warn "No such file: \"$filename\""; next; diff --git a/ui/Makefile.am b/ui/Makefile.am index 9cff88f696..3c33aee04c 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -76,11 +76,13 @@ endif checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_UI_SRC) checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_UI_SRC) EXTRA_DIST = \ diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index c6b4a7b8ae..9ae3d315dc 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -84,11 +84,13 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \ + -sourcedir=$(srcdir) \ $(TSHARK_TAP_SRC) checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + -sourcedir=$(srcdir) \ $(TSHARK_TAP_SRC) EXTRA_DIST = \ diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index d79ba79013..89ce322430 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -87,12 +87,14 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ capture_if_details_dlg_win32.c checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index e22775f92e..1196fcc1d8 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -209,13 +209,15 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ + -sourcedir=$(srcdir) \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index c0151c6601..04900bf493 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -104,5 +104,7 @@ dumpabi-libwiretap: all abi-descriptor.xml checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error -## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) - $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) $(GENERATOR_FILES) +## $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(NONGENERATED_C_FILES) $(GENERATOR_FILES) diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index b5b9c910d5..603e3ac3e7 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -121,8 +121,10 @@ dumpabi-libwsutil: all abi-descriptor.xml cd .libs && ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz checkapi: - $(PERL) ../tools/checkAPIs.pl -g termoutput -build \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ + -sourcedir=$(srcdir) \ $(LIBWSUTIL_SRC) -# $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ +# $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ +# -sourcedir=$(srcdir) \ # file_util.c unicode-utils.c |