Add a Makefile.am.inc file, to hold rules etc. used by multiple

Makefile.am files; currently, it has the (F)lex-to-C rule.  Have
Makefile.am files with .l.c rules include Makefile.am.inc to get that
rule.

svn path=/trunk/; revision=22436

6 files changed, 39 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index 0b6bdc489c..f9c9fe82d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -463,6 +463,7 @@ MAINTAINERCLEANFILES =		\
 EXTRA_DIST = \
 	FAQ			\
 	INSTALL.configure	\
+	Makefile.am.inc		\
 	Makefile.common		\
 	Makefile.nmake		\
 	README.aix		\
diff --git a/Makefile.am.inc b/Makefile.am.inc
new file mode 100644
index 0000000000..00fd7d23f1
--- /dev/null
+++ b/Makefile.am.inc
@@ -0,0 +1,29 @@
+# Makefile.am.inc
+# Include file for Makefile.am files to get additional rules
+#
+# $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.
+
+.l.c:
+	@if [ ! -x "$(LEX)" ]; then \
+		echo "Neither lex nor flex was found"; \
+		exit 1; \
+	fi
+	$(LEX) -o$@ $<
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 1b8b29c613..402a81e280 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -22,6 +22,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+include ../Makefile.am.inc
+
 if HAVE_LIBLUA
 wslua_lib = wslua/libwslua.la
 wslua_dir = wslua
@@ -125,13 +127,6 @@ tvbtest: tvbtest.o tvbuff.o except.o strutil.o emem.o
 exntest: exntest.o except.o
 	$(LINK) $^ $(GLIB_LIBS)
 
-.l.c:
-	@if [ ! -x "$(LEX)" ]; then \
-		echo "Neither lex nor flex was found"; \
-		exit 1; \
-	fi
-	$(LEX) -o$@ $<
-
 dtd_grammar.h: dtd_grammar.c
 
 LEMON=../tools/lemon
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 7cbec8f763..ad45ac4424 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -21,6 +21,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
+
+include ../../Makefile.am.inc
+
 if HAVE_WARNINGS_AS_ERRORS
 AM_NON_GENERATED_CFLAGS = -Werror
 endif
@@ -93,13 +96,6 @@ EXTRA_DIST = \
 	scanner.l		\
 	Makefile.nmake		
 
-.l.c:
-	@if [ ! -x "$(LEX)" ]; then \
-		echo "Neither lex nor flex was found"; \
-		exit 1; \
-	fi
-	$(LEX) -o$@ $<
-
 scanner.o : scanner.c grammar.h
 
 LEMON=../../tools/lemon
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index fb8f258bb8..d4b3af143f 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -22,6 +22,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
+include ../../Makefile.am.inc
+
 INCLUDES = -I$(top_srcdir)
 
 include Makefile.common
@@ -130,13 +132,6 @@ EXTRA_DIST = \
 	moduleinfo.nmake	\
 	plugin.rc.in
 
-.l.c:
-	@if [ ! -x "$(LEX)" ]; then \
-		echo "Neither lex nor flex was found"; \
-		exit 1; \
-	fi
-	$(LEX) -o$@ $<
-
 LEMON = ../../tools/lemon
 
 mate_grammar.h : mate_grammar.c
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 4aeb98cacc..982526e86b 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -21,6 +21,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+include ../Makefile.am.inc
+
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
 include Makefile.common
@@ -78,10 +80,3 @@ ascend-grammar.c : ascend-grammar.y
 		exit 1; \
 	fi
 	$(YACC) -d -p ascend -o ascend-grammar.c $(srcdir)/ascend-grammar.y
-
-.l.c:
-	@if [ ! -x "$(LEX)" ]; then \
-		echo "Neither lex nor flex was found"; \
-		exit 1; \
-	fi
-	$(LEX) -o$@ $<