diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-04-23 10:50:27 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-25 04:23:46 +0000 |
| commit | bd38b3152d12584b9cd31d0c49706f1cebaa087a (patch) | |
| tree | dd9ffd4b9f64647e9c683085b0fb73337132a7ab /epan | |
| parent | 748e0d4221eabab207a350640ce3f526c73afde9 (diff) | |
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>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.am | 4 | ||||
| -rw-r--r-- | epan/crypt/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.am | 7 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 5 | ||||
| -rw-r--r-- | epan/ftypes/Makefile.am | 5 | ||||
| -rw-r--r-- | epan/wmem/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 3 |
7 files changed, 19 insertions, 11 deletions
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 \ |