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 /ui | |
| parent | 748e0d4221eabab207a350640ce3f526c73afde9 (diff) | |
| download | wireshark-bd38b3152d12584b9cd31d0c49706f1cebaa087a.tar.gz | |
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 'ui')
| -rw-r--r-- | ui/Makefile.am | 6 | ||||
| -rw-r--r-- | ui/cli/Makefile.am | 6 | ||||
| -rw-r--r-- | ui/gtk/Makefile.am | 6 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 6 |
4 files changed, 16 insertions, 8 deletions
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 |