summaryrefslogtreecommitdiff
path: root/ui/cli
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-05-12 11:02:57 -0400
committerAnders Broman <a.broman58@gmail.com>2016-05-13 04:04:19 +0000
commit2b52f2440c31811e8ffd05970f09b03cf19602b2 (patch)
tree04e326d66b8d4272260f80dbf4b9ba76ce2c8127 /ui/cli
parent8c614b8afb60b9428e704c598ba200fa0188345d (diff)
downloadwireshark-2b52f2440c31811e8ffd05970f09b03cf19602b2.tar.gz
automake/nmake: run checkAPIs in ui/cli/
cmake already does this. Use checkAPIs arguments appropriate to the cli directory (there's no gtk code here so don't bother checking for deprecated gtk APIs). Change-Id: I3e76ed5260223f05ac1b42431569bde3d1c596ea Reviewed-on: https://code.wireshark.org/review/15403 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/cli')
-rw-r--r--ui/cli/Makefile.am14
-rw-r--r--ui/cli/Makefile.nmake11
2 files changed, 5 insertions, 20 deletions
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 74b6473ace..a10dd5d6fb 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -69,17 +69,9 @@ if HAVE_DOXYGEN
$(DOXYGEN) doxygen.cfg
endif # HAVE_DOXYGEN
-checkapi: checkapi-base checkapi-todo
-
-checkapi-base:
- $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \
- -sourcedir=$(srcdir) \
- $(TSHARK_TAP_SRC)
-
-checkapi-todo:
- $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
- -sourcedir=$(srcdir) \
- $(TSHARK_TAP_SRC)
+checkapi:
+ $(PERL) $(top_srcdir)/tools/checkAPIs.pl -build \
+ -sourcedir=$(srcdir) $(TSHARK_TAP_SRC)
EXTRA_DIST = \
.editorconfig \
diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake
index f7e9a89b37..e3e24b2476 100644
--- a/ui/cli/Makefile.nmake
+++ b/ui/cli/Makefile.nmake
@@ -59,12 +59,5 @@ distclean: clean
maintainer-clean: distclean
rm -f $(GENERATED_FILES)
-checkapi: checkapi-base checkapi-todo
-
-checkapi-base:
- $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \
- $(TSHARK_TAP_SRC)
-
-checkapi-todo:
- $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
- $(TSHARK_TAP_SRC)
+checkapi:
+ $(PERL) ../../tools/checkAPIs.pl -build $(TSHARK_TAP_SRC)