Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.

svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00 · 2010-11-30 02:04:55 +00:00 · c755b2fd54
parent a857d6d69b
commit c755b2fd54
15 changed files with 58 additions and 44 deletions
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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 >> $@
--- 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)
--- 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)