Oh yeah, there's a reason we don't put targets in Makefile.common: the first target...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35075 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 2f3097727c49ad47e52575b89d8db15b886032ad..5ad26e8a5627de2402464efe78242a24c18ea984 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -292,3 +292,6 @@ 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 a64a498e4cadd35efe4217f32d54bd456096b2fb..9026c9ea3e9a2d6ec1fdf2f7eae1294bf8c7d6a8 100644 (file)
--- 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,7 +258,3 @@ 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 daa79e024c26842568e965b1241ca89984ee9b0e..c1d69fb2c9ea459940ddc09ae4aaf626a5d94bc6 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -330,3 +330,6 @@ 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 cb06d2cfab6bdeff8af5960210ee0031f7fe1af1..8db34750043401128d0a7e78504a0e73e90cad0d 100644 (file)
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -47,4 +47,8 @@ libairpdcap_la_SOURCES =      \
 
 EXTRA_DIST = \
        Makefile.common \
-       Makefile.nmake
+       Makefile.nmake 
+
+checkapi:
+       $(PERL) ../../tools/checkAPIs.pl -g termoutput \
+       $(LIBAIRPDCAP_SRC)

diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common
index 7a714eae4d288293c60689aa6bf411899a16fcb0..93c5f6553724e2d780f11470521dfd64fbb37f4f 100644 (file)
--- a/epan/crypt/Makefile.common
+++ b/epan/crypt/Makefile.common
@@ -52,8 +52,3 @@ 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 1817ab65f5de688bacc96004036bc4305e0b88b8..b05773a2cf696cbc9dfe878074b0e734c65d2f05 100644 (file)
--- 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,3 +24,7 @@ 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 33a5fd16f54cf369b9ee01fa6ff84b4db3213b3e..2f10f0c05ba363a3c4d3920080686cdcbd47bffe 100644 (file)
--- 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 f92156a9712e0b74b635231a06e24fc129265725..eaaa4d66629d55b652b617088a823d7d80a7e40c 100644 (file)
--- a/epan/dfilter/Makefile.common
+++ b/epan/dfilter/Makefile.common
@@ -76,8 +76,3 @@ 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 5dd5946c2999354c04ba668883665b266c90d8a1..d79e33e3d7c798dac65ace3980f17a60ccec6497 100644 (file)
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -57,9 +57,14 @@ 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 98b70698d3b408fadb9fdee9e66d4dbf0c7c4f29..587ea3232db56ec80f01acd83b3dfd760467db82 100644 (file)
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -140,3 +140,8 @@ 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 86cd9663b70ddaff594e09f0a92f68cb4798ac00..9f9a602b40b117419995347c40e011357f6c755e 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1373,9 +1373,3 @@ 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 379da52ac946b55d5e47e9bb9ae169a2732e2ae0..7ca1b1cd9ee3c98271de63e8af802c9d6ced4b2e 100644 (file)
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -109,3 +109,8 @@ 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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 49c6c04bfcbd3a398afc7570facdf817d9ccb2ce..18d2a0dcd1c2b1a4d28cd08ba088642da6098763 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -70,6 +70,12 @@ if HAVE_DOXYGEN
        $(DOXYGEN) doxygen.cfg
 endif          # HAVE_DOXYGEN
 
+checkapi:
+       $(PERL) ../tools/checkAPIs.pl \
+       $(WIRESHARK_GTK_SRC) \
+       $(WIRESHARK_TAP_SRC) \
+       capture_if_details_dlg_win32.c
+
 expert_indicators.h:
        echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
        echo >> $@

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 3f713144b7e30610694460948c90f80928e88ccd..b3fa7bee0ace2f8b2009a4ee803acbb753503651 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -335,14 +335,3 @@ noinst_HEADERS = \
        voip_calls_dlg.h \
        webbrowser.h
 
-checkapi: checkapi-base checkapi-todo
-
-checkapi-base:
-       $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \
-       $(WIRESHARK_GTK_SRC) \
-       $(WIRESHARK_TAP_SRC)
-
-checkapi-todo:
-       $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
-       $(WIRESHARK_GTK_SRC) \
-       $(WIRESHARK_TAP_SRC)

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 760bc34595f6a5f2f65238cc7e316a344d968c9f..5da46b0deda080dc8cb55fd8c9796ba12c086226 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -28,10 +28,9 @@ include Makefile.common
 
 
 # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
-WIRESHARK_GTK_ALL_SRC = \
+WIRESHARK_GTK_SRC = \
        $(WIRESHARK_GTK_SRC) \
        $(GENERATED_C_FILES) \
-       $(DIRTY_GENERATED_C_FILES) \
        capture_if_details_dlg_win32.c  \
 !IFDEF PORTAUDIO_DIR
 !IF "$(PORTAUDIO_VERSION)" == "18"
@@ -57,7 +56,7 @@ WIRESHARK_GTK_ALL_SRC = \
 WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
 
 
-WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_ALL_SRC:.c=.obj)
+WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_SRC:.c=.obj) $(DIRTY_GENERATED_C_FILES:.c=.obj)
 
 
 libui.lib      : ..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS)
@@ -170,3 +169,14 @@ doxygen.chm:
 
 doxygen: doxygen.cfg doxygen-run doxygen.chm
 
+checkapi: checkapi-base checkapi-todo
+
+checkapi-base:
+       $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \
+       $(WIRESHARK_GTK_SRC) \
+       $(WIRESHARK_TAP_SRC)
+
+checkapi-todo:
+       $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
+       $(WIRESHARK_GTK_SRC) \
+       $(WIRESHARK_TAP_SRC)