From bd38b3152d12584b9cd31d0c49706f1cebaa087a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Wed, 23 Apr 2014 10:50:27 +0200 Subject: 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 --- plugins/asn1/Makefile.am | 3 ++- plugins/docsis/Makefile.am | 3 ++- plugins/ethercat/Makefile.am | 3 ++- plugins/gryphon/Makefile.am | 3 ++- plugins/irda/Makefile.am | 3 ++- plugins/m2m/Makefile.am | 3 ++- plugins/mate/Makefile.am | 3 ++- plugins/opcua/Makefile.am | 3 ++- plugins/profinet/Makefile.am | 3 ++- plugins/stats_tree/Makefile.am | 3 ++- plugins/tpg/Makefile.am | 4 +++- plugins/unistim/Makefile.am | 3 ++- plugins/wimax/Makefile.am | 3 ++- plugins/wimaxasncp/Makefile.am | 3 ++- plugins/wimaxmacphy/Makefile.am | 3 ++- 15 files changed, 31 insertions(+), 15 deletions(-) (limited to 'plugins') 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) -- cgit v1.2.3