Add Makefile.common files for epan/dfilter and epan/ftypes.

Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656

13 files changed, 178 insertions, 126 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 014dcb578d..577a1dbccd 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -293,3 +293,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.nmake b/epan/Makefile.nmake
index 5287dcc37d..8a302c2e4f 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -310,4 +310,4 @@ 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) \
+	$(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index 6ef883ddfd..8db3475004 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -48,3 +48,7 @@ libairpdcap_la_SOURCES =	\
 EXTRA_DIST = \
 	Makefile.common	\
 	Makefile.nmake 
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
+	$(LIBAIRPDCAP_SRC)
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 155256fb22..2f10f0c05b 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -5,7 +5,6 @@
 # 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
@@ -28,6 +27,8 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_NON_GENERATED_CFLAGS = -Werror
 endif
 
+include Makefile.common
+
 noinst_LTLIBRARIES = libdfilter_generated.la libdfilter.la
 
 CLEANFILES = \
@@ -53,49 +54,19 @@ INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
 #libraries.  A single library is generated with the lex code without the barrier
 #"stop on warning". An other library is generated from the remaining source
 #files with the "stop on warning" barrier.
-libdfilter_la_SOURCES = \
-	dfilter.c		\
-	dfilter.h		\
-	dfilter-int.h		\
-	dfilter-macro.h 	\
-	dfilter-macro.c 	\
-	dfunctions.c		\
-	dfunctions.h		\
-	dfvm.c			\
-	dfvm.h			\
-	drange.c		\
-	drange.h		\
-	gencode.c		\
-	gencode.h		\
-	glib-util.c		\
-	glib-util.h		\
-	semcheck.c		\
-	semcheck.h		\
-	sttype-function.c	\
-	sttype-function.h	\
-	sttype-integer.c	\
-	sttype-pointer.c	\
-	sttype-range.c		\
-	sttype-range.h		\
-	sttype-string.c		\
-	sttype-test.c		\
-	sttype-test.h		\
-	syntax-tree.c		\
-	syntax-tree.h
+libdfilter_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 libdfilter_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS)
 
 libdfilter_generated_la_SOURCES = \
-	grammar.c 		\
-	grammar.h 		\
-	scanner.c		\
-	scanner_lex.h
+	$(GENERATED_C_FILES)	\
+	$(GENERATED_HEADER_FILES)
 
 libdfilter_la_LIBADD = libdfilter_generated.la
 libdfilter_la_DEPENDENCIES = libdfilter_generated.la
 
 EXTRA_DIST = \
-	grammar.lemon		\
-	scanner.l		\
+	$(GENERATOR_FILES)	\
+	Makefile.common		\
 	Makefile.nmake		
 
 RUNLEX=$(top_srcdir)/tools/runlex.sh
diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common
new file mode 100644
index 0000000000..5dd4411502
--- /dev/null
+++ b/epan/dfilter/Makefile.common
@@ -0,0 +1,80 @@
+# Makefile.common
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# C source files that are part of the display filter source; this includes only
+# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list
+# into a list of object files by replacing ".c" with ".obj") or files
+# generated from YACC or Lex files (as Automake doesn't want them in
+# _SOURCES variables).
+NONGENERATED_C_FILES = \
+	dfilter.c		\
+	dfilter-macro.c 	\
+	dfunctions.c		\
+	dfvm.c			\
+	drange.c		\
+	gencode.c		\
+	glib-util.c		\
+	semcheck.c		\
+	sttype-function.c	\
+	sttype-integer.c	\
+	sttype-pointer.c	\
+	sttype-range.c		\
+	sttype-string.c		\
+	sttype-test.c		\
+	syntax-tree.c
+
+# Header files that are not generated from other files
+NONGENERATED_HEADER_FILES = \
+	dfilter.h		\
+	dfilter-macro.h 	\
+	dfilter-int.h		\
+	dfunctions.h		\
+	dfvm.h			\
+	drange.h		\
+	gencode.h		\
+	glib-util.h		\
+	semcheck.h		\
+	sttype-function.h	\
+	sttype-range.h		\
+	sttype-test.h		\
+	syntax-tree.h
+
+# Files that generate compileable files
+GENERATOR_FILES = \
+	grammar.lemon		\
+        scanner.l
+
+# The C source files they generate.
+GENERATED_C_FILES = \
+	grammar.c 		\
+	scanner.c
+
+# The header files that they generate.
+GENERATED_HEADER_FILES = \
+	grammar.h 		\
+	scanner_lex.h
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index c0b28c83af..a8893640c5 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -16,24 +16,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 .c.obj::
    $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-OBJECTS = \
-	dfilter.obj		\
-	dfilter-macro.obj \
-	dfunctions.obj	\
-	dfvm.obj		\
-	drange.obj		\
-	gencode.obj		\
-	glib-util.obj		\
-	grammar.obj		\
-	scanner.obj		\
-	semcheck.obj		\
-	sttype-function.obj	\
-	sttype-integer.obj	\
-	sttype-pointer.obj	\
-	sttype-range.obj	\
-	sttype-string.obj	\
-	sttype-test.obj		\
-	syntax-tree.obj
+OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj)
 
 dfilter.lib	: $(OBJECTS)
 	link /lib /out:dfilter.lib $(OBJECTS)
@@ -58,7 +41,7 @@ clean:
 # the same for now.
 #
 distclean: clean
-	rm -f scanner.c scanner_lex.h grammar.c grammar.h grammar.out
+	rm -f $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) grammar.out
 
 maintainer-clean: distclean
 
@@ -78,21 +61,5 @@ $(LEMON)\lemon.exe:
 
 checkapi:
 	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
-	scanner.l \
-	grammar.lemon		\
-	dfilter.c		\
-	dfilter-macro.c \
-	dfunctions.c	\
-	dfvm.c		\
-	drange.c		\
-	gencode.c		\
-	glib-util.c		\
-	semcheck.c		\
-	sttype-function.c	\
-	sttype-integer.c	\
-	sttype-pointer.c	\
-	sttype-range.c	\
-	sttype-string.c	\
-	sttype-test.c		\
-	syntax-tree.c
-
+		$(GENERATOR_FILES)	\
+		$(NONGENERATED_C_FILES)
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index eadfcd4c3b..4b478980ce 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -150,3 +150,8 @@ CLEANFILES = \
 MAINTAINERCLEANFILES =	\
 	$(GENERATED_FILES)	\
 	Makefile.in
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
+		$(ALL_DISSECTORS_SRC) \
+		packet-dcerpc-nt.c
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 9d8b06a008..33e5985a56 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -112,5 +112,5 @@ maintainer-clean: distclean
 
 checkapi:
 	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
-	$(ALL_DISSECTORS_SRC) \
-	packet-dcerpc-nt.c
+		$(ALL_DISSECTORS_SRC) \
+		packet-dcerpc-nt.c
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index c0b6665e97..67f39d22c6 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -6,7 +6,6 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 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
@@ -25,6 +24,8 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_CFLAGS = -Werror
 endif
 
+include Makefile.common
+
 noinst_LTLIBRARIES = libftypes.la
 
 CLEANFILES = \
@@ -37,23 +38,14 @@ MAINTAINERCLEANFILES = \
 
 INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
 
-libftypes_la_SOURCES =	\
-	ftypes.c	\
-	ftypes.h	\
-	ftypes-int.h	\
-	ftype-bytes.c	\
-	ftype-double.c	\
-	ftype-integer.c	\
-	ftype-ipv4.c	\
-	ftype-guid.c	\
-	ftype-none.c	\
-	ftype-pcre.c	\
-	ftype-string.c	\
-	ftype-time.c	\
-	ftype-tvbuff.c
+libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 
 libftypes_la_LIBADD = @GLIB_LIBS@ @PCRE_LIBS@
 
 EXTRA_DIST = \
+	Makefile.common		\
 	Makefile.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
+		$(NONGENERATED_C_FILES)
diff --git a/epan/ftypes/Makefile.common b/epan/ftypes/Makefile.common
new file mode 100644
index 0000000000..53d3b6728f
--- /dev/null
+++ b/epan/ftypes/Makefile.common
@@ -0,0 +1,47 @@
+# Makefile.common
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# C source files that are part of the display filter source; this includes only
+# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list
+# into a list of object files by replacing ".c" with ".obj") or files
+# generated from YACC or Lex files (as Automake doesn't want them in
+# _SOURCES variables).
+NONGENERATED_C_FILES = \
+	ftypes.c	\
+	ftype-bytes.c	\
+	ftype-double.c	\
+	ftype-integer.c	\
+	ftype-ipv4.c	\
+	ftype-guid.c	\
+	ftype-none.c	\
+	ftype-pcre.c	\
+	ftype-string.c	\
+	ftype-time.c	\
+	ftype-tvbuff.c
+
+# Header files that are not generated from other files
+NONGENERATED_HEADER_FILES = \
+	ftypes.h	\
+	ftypes-int.h
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 5cd5571b6f..7125476c24 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -15,20 +15,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 .c.obj::
    $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-
-OBJECTS = \
-	ftypes.obj		\
-	ftype-bytes.obj		\
-	ftype-double.obj	\
-	ftype-integer.obj	\
-	ftype-ipv4.obj		\
-	ftype-guid.obj		\
-	ftype-none.obj		\
-	ftype-pcre.obj		\
-	ftype-string.obj	\
-	ftype-time.obj		\
-	ftype-tvbuff.obj
-
+OBJECTS=$(NONGENERATED_C_FILES:.c=.obj)
 
 ftypes.lib	: $(OBJECTS)
 	link /lib /out:ftypes.lib $(OBJECTS)
@@ -42,14 +29,4 @@ maintainer-clean: distclean
 
 checkapi:
 	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
-	ftypes.c		\
-	ftype-bytes.c		\
-	ftype-double.c	\
-	ftype-integer.c	\
-	ftype-ipv4.c		\
-	ftype-guid.c		\
-	ftype-none.c		\
-	ftype-pcre.c		\
-	ftype-string.c	\
-	ftype-time.c		\
-	ftype-tvbuff.c
+		$(NONGENERATED_C_FILES)
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index f476d20f2e..9482c0a27d 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -109,3 +109,18 @@ dummy:
 
 init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h  ../proto.h ../../stat_menu.h
 	$(PERL) $(srcdir)/make-init-lua.pl $(srcdir) $(srcdir)/template-init.lua > init.lua
+
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl -g termoutput \
+	init_wslua.c \
+	register_wslua.c \
+	taps_wslua.c \
+	wslua_dumper.c \
+	wslua_field.c \
+	wslua_gui.c \
+	wslua_pinfo.c \
+	wslua_proto.c \
+	wslua_listener.c \
+	wslua_tree.c \
+	wslua_tvb.c \
+	wslua_util.c
diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index 1631937f90..75bb183d12 100644
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -86,13 +86,4 @@ checkapi:
 	$(MODULES)	\
 	init_wslua.c \
 	register_wslua.c \
-	taps_wslua.c \
-	wslua_dumper.c \
-	wslua_field.c \
-	wslua_gui.c \
-	wslua_pinfo.c \
-	wslua_proto.c \
-	wslua_listener.c \
-	wslua_tree.c \
-	wslua_tvb.c \
-	wslua_util.c
+	taps_wslua.c