osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Support out-of-source checkapi 

Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir)
from Makefile.am to allow out-of-source 'make checkapi'.

Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973
Reviewed-on: https://code.wireshark.org/review/1294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stig Bjørlykke 2014-04-23 10:50:27 +02:00 committed by Anders Broman
parent 748e0d4221
commit bd38b3152d
32 changed files with 88 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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)

3
codecs/Makefile.am
View File

@ -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 = \

4
epan/Makefile.am
View File

@ -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)

3
epan/crypt/Makefile.am
View File

@ -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)

7
epan/dfilter/Makefile.am
View File

@ -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)

5
epan/dissectors/Makefile.am
View File

@ -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)

5
epan/ftypes/Makefile.am
View File

@ -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)

3
epan/wmem/Makefile.am
View File

@ -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)
#

3
epan/wslua/Makefile.am
View File

@ -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 \

6
filetap/Makefile.am
View File

@ -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)

3
plugins/asn1/Makefile.am
View File

@ -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)

3
plugins/docsis/Makefile.am
View File

@ -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)

3
plugins/ethercat/Makefile.am
View File

@ -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)

3
plugins/gryphon/Makefile.am
View File

@ -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)

3
plugins/irda/Makefile.am
View File

@ -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)

3
plugins/m2m/Makefile.am
View File

@ -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)

3
plugins/mate/Makefile.am
View File

@ -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)

3
plugins/opcua/Makefile.am
View File

@ -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)

3
plugins/profinet/Makefile.am
View File

@ -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)

3
plugins/stats_tree/Makefile.am
View File

@ -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)

4
plugins/tpg/Makefile.am
View File

@ -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)

3
plugins/unistim/Makefile.am
View File

@ -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)

3
plugins/wimax/Makefile.am
View File

@ -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)

3
plugins/wimaxasncp/Makefile.am
View File

@ -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)

3
plugins/wimaxmacphy/Makefile.am
View File

@ -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)

6
tools/checkAPIs.pl
View File

@ -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;

6
ui/Makefile.am
View File

@ -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 = \

6
ui/cli/Makefile.am
View File

@ -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 = \

6
ui/gtk/Makefile.am
View File

@ -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

6
ui/qt/Makefile.am
View File

@ -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

6
wiretap/Makefile.am
View File

@ -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)

6
wsutil/Makefile.am
View File

@ -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