Move some checkapi targets into Makefile.common

svn path=/trunk/; revision=35073

12 files changed, 30 insertions, 39 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 5ad26e8a56..2f3097727c 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -292,6 +292,3 @@ doxygen:
 if HAVE_DOXYGEN
 	$(DOXYGEN) doxygen.cfg
 endif		# HAVE_DOXYGEN
-
-checkapi:
-	$(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 9026c9ea3e..a64a498e4c 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -125,7 +125,7 @@ LIBWIRESHARK_GENERATED_SRC = 	\
 LIBWIRESHARK_ALL_SRC = \
 	$(LIBWIRESHARK_SRC) 	\
 	$(LIBWIRESHARK_GENERATED_SRC)
-	
+
 LIBWIRESHARK_INCLUDES = 	\
 	addr_and_mask.h		\
 	addr_resolv.h		\
@@ -258,3 +258,7 @@ LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES = \
 LIBWIRESHARK_GENERATED_INCLUDES = 	\
 	$(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \
 	$(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES)
+
+
+checkapi:
+	$(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index c1d69fb2c9..daa79e024c 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -330,6 +330,3 @@ LEMON=..\tools\lemon
 dtd_grammar.h: dtd_grammar.c
 dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon
 	$(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon
-
-checkapi:
-	$(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index 8db3475004..cb06d2cfab 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -47,8 +47,4 @@ libairpdcap_la_SOURCES =	\
 
 EXTRA_DIST = \
 	Makefile.common	\
-	Makefile.nmake 
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
-	$(LIBAIRPDCAP_SRC)
+	Makefile.nmake
diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common
index 93c5f65537..7a714eae4d 100644
--- a/epan/crypt/Makefile.common
+++ b/epan/crypt/Makefile.common
@@ -52,3 +52,8 @@ LIBAIRPDCAP_INCLUDES =	\
 	crypt-rc4.h		\
 	crypt-sha1.h		\
 	wep-wpadefs.h
+
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
+	$(LIBAIRPDCAP_SRC)
diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake
index b05773a2cf..1817ab65f5 100644
--- a/epan/crypt/Makefile.nmake
+++ b/epan/crypt/Makefile.nmake
@@ -15,8 +15,8 @@ CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
 
 AIRPDCAP_OBJECTS = $(LIBAIRPDCAP_SRC:.c=.obj)
 
-airpdcap.lib: $(AIRPDCAP_OBJECTS) 
-	link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS) 
+airpdcap.lib: $(AIRPDCAP_OBJECTS)
+	link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS)
 
 clean:
         rm -f $(AIRPDCAP_OBJECTS) airpdcap.lib *.pdb
@@ -24,7 +24,3 @@ clean:
 distclean: clean
 
 maintainer-clean: distclean
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
-	$(LIBAIRPDCAP_SRC)
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 2f10f0c05b..33a5fd16f5 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -5,17 +5,17 @@
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 2001 Gerald Combs
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -67,7 +67,7 @@ libdfilter_la_DEPENDENCIES = libdfilter_generated.la
 EXTRA_DIST = \
 	$(GENERATOR_FILES)	\
 	Makefile.common		\
-	Makefile.nmake		
+	Makefile.nmake
 
 RUNLEX=$(top_srcdir)/tools/runlex.sh
 
@@ -75,7 +75,7 @@ scanner_lex.h : scanner.c
 
 LEMON=../../tools/lemon
 
-grammar.h : grammar.c 
+grammar.h : grammar.c
 grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon
 	$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
 		(rm -f grammar.c grammar.h ; false)
diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common
index eaaa4d6662..f92156a971 100644
--- a/epan/dfilter/Makefile.common
+++ b/epan/dfilter/Makefile.common
@@ -76,3 +76,8 @@ GENERATED_HEADER_FILES = \
 
 # All the generated files.
 GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
+		$(GENERATOR_FILES)	\
+		$(NONGENERATED_C_FILES)
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index d79e33e3d7..5dd5946c29 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -57,14 +57,9 @@ scanner.obj : scanner.c grammar.h
 
 grammar.h : grammar.c
 grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon
-	$(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon 
+	$(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon
 
 $(LEMON)\lemon.exe:
 	cd ../../tools
 	$(MAKE) /$(MAKEFLAGS) -f makefile.nmake lemon
 	cd ../epan/dfilter
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
-		$(GENERATOR_FILES)	\
-		$(NONGENERATED_C_FILES)
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 587ea3232d..98b70698d3 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -140,8 +140,3 @@ CLEANFILES = \
 MAINTAINERCLEANFILES =	\
 	$(GENERATED_FILES)	\
 	Makefile.in
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
-		$(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \
-		packet-dcerpc-nt.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 9f9a602b40..86cd9663b7 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1373,3 +1373,9 @@ ALL_DISSECTORS_SRC = \
 	$(ASN1_DISSECTOR_SRC) \
 	$(DIRTY_ASN1_DISSECTOR_SRC) \
 	$(CUSTOM_DISSECTOR_SRC)
+
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
+		$(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \
+		packet-dcerpc-nt.c
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 7ca1b1cd9e..379da52ac9 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -109,8 +109,3 @@ distclean: clean
 
 maintainer-clean: distclean
 	rm -f $(GENERATED_FILES)
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
-		$(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \
-		packet-dcerpc-nt.c