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

Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656

3 files changed, 56 insertions, 40 deletions

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)