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.

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

diff --git a/Makefile.am b/Makefile.am
index 0b6bdc489cb41b75312eea3f5bc92c56f45e74fd..f9c9fe82d2b8ed466b5aa495bea96119f10cb37c 100644 (file)
--- 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 (file)
index 0000000..00fd7d2
--- /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 1b8b29c6137dda0726bc26b4edd3c1f47b71cedf..402a81e280e65f24c59502207b529ba1ead1bb65 100644 (file)
--- 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 7cbec8f7632552947985a93615ebb9a602717a81..ad45ac442460968e8bc756974e5535b7e6472e65 100644 (file)
--- 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 fb8f258bb81a861fca903874a681d83d13bda617..d4b3af143fe96e9fab8dfd77b4a87eaf6bdb3ee1 100644 (file)
--- 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 4aeb98cacc02fd9a47f853083b9ce69c813e9735..982526e86b135f64f15b24d9cf8cba61d340684d 100644 (file)
--- 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$@ $<