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

Makefile.nmake files; currently, it has the (F)lex-to-C rule and a
.SUFFIXES pseudo-rule to add .l to the list of suffixes.  Have
Makefile.nmake files with .l.c rules include Makefile.nmake.inc to get
that rule.

The names Makefile.am.inc and Makefile.nmake.inc aren't necessarily the
right names for the files in question.

Use $(PACKAGE) in the Mate plugin's Makefile, rather than "mate".

svn path=/trunk/; revision=22437

6 files changed, 35 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index f9c9fe82d2..89fbf4e866 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -466,6 +466,7 @@ EXTRA_DIST = \
 	Makefile.am.inc		\
 	Makefile.common		\
 	Makefile.nmake		\
+	Makefile.nmake.inc	\
 	README.aix		\
 	README.bsd		\
 	README.hpux		\
diff --git a/Makefile.nmake.inc b/Makefile.nmake.inc
new file mode 100644
index 0000000000..8dc5e2ef0a
--- /dev/null
+++ b/Makefile.nmake.inc
@@ -0,0 +1,27 @@
+# Makefile.nmake.inc
+# Include file for Makefile.am files to get additional rules
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 2007 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.
+
+.SUFFIXES: .l
+
+.l.c:
+	$(LEX) -o$@ $<
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 67aaa58a62..dae50a16c2 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -5,10 +5,9 @@
 
 include ..\config.nmake
 include <win32.mak>
-include Makefile.common
-
+include ..\Makefile.nmake.inc
 
-############### no need to modify below this line #########
+include Makefile.common
 
 LINK= link
 
@@ -45,14 +44,9 @@ libwireshark_LIBS = \
 	$(WSLUA_LIB) \
 	dissectors\dissectors.lib
 
-.SUFFIXES: .l
-
 .c.obj::
 	$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-.l.c:
-	$(LEX) -o$@ $<
-	
 LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_ALL_SRC:.c=.obj)
 
 EXTRA_OBJECTS = \
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index c985a6765c..3ea7f83037 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -4,8 +4,7 @@
 # $Id$
 
 include ..\..\config.nmake
-
-############### no need to modify below this line #########
+include ..\..\Makefile.nmake.inc
 
 LEMON=..\..\tools\lemon
 
@@ -14,14 +13,9 @@ CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
-.SUFFIXES: .l
-
 .c.obj::
    $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-.l.c:
-	$(LEX) -o$@ $<
-	
 OBJECTS = \
 	dfilter.obj		\
 	dfilter-macro.obj \
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 1876b70133..99f9f93eae 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -5,6 +5,8 @@
 #
 
 include ..\..\config.nmake
+include ..\..\Makefile.nmake.inc
+
 include moduleinfo.nmake
 
 include Makefile.common
@@ -14,14 +16,9 @@ LEMON=..\..\tools\lemon
 CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) /I$(LEMON)\
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
-.SUFFIXES: .l
-
 .c.obj::
-	$(CC) $(CFLAGS) -Fdmate.pdb -c $<
+	$(CC) $(CFLAGS) -Fd$(PACKAGE).pdb -c $<
 
-.l.c:
-	$(LEX) -o$@ $<
-	
 LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 89619a5213..26170c68be 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -4,8 +4,7 @@
 
 include ..\config.nmake
 include <win32.mak>
-
-############### no need to modify below this line #########
+include ..\Makefile.nmake.inc
 
 include Makefile.common
 
@@ -14,14 +13,9 @@ CFLAGS=-WX -DYYMALLOC=malloc -DYYFREE=free -DHAVE_CONFIG_H $(GLIB_CFLAGS) $(ZLIB
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
-.SUFFIXES: .l
-
 .c.obj::
 	$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-.l.c:
-	$(LEX) -o$@ $<
-	
 OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) file_util.obj
 
 wiretap_LIBS = \