4 files changed, 30 insertions, 24 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 4b37806a1c..67aaa58a62 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -45,9 +45,14 @@ 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 = \
@@ -256,25 +261,20 @@ inet_ntop.c: ..\inet_ntop.c
 inet_pton.c: ..\inet_pton.c
 	xcopy ..\inet_pton.c . /d
 
-radius_dict.c : radius_dict.l
-	$(LEX) radius_dict.l
-
-diam_dict.c : diam_dict.l
-	$(LEX) diam_dict.l
-
 sminmpec.c: enterprise-numbers make-sminmpec.pl
 	$(PERL) make-sminmpec.pl enterprise-numbers sminmpec.c
 
-dtd_parse.c : dtd_parse.l
-	$(LEX) -odtd_parse.c dtd_parse.l
+dtd_grammar.h: dtd_grammar.c
 
-dtd_preparse.c : dtd_preparse.l
-	$(LEX) -odtd_preparse.c dtd_preparse.l
+radius_dict.obj : radius_dict.c
 
-uat_load.c : uat_load.l
-	$(LEX) -ouat_load.c uat_load.l
+diam_dict.obj : diam_dict.c
 
-dtd_grammar.h: dtd_grammar.c
+dtd_parse.obj : dtd_parse.c
+
+dtd_preparse.obj : dtd_preparse.c
+
+uat_load.obj : uat_load.c
 
 LEMON=..\tools\lemon
 
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 218284a625..c985a6765c 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -14,10 +14,14 @@ 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 \
@@ -64,9 +68,6 @@ distclean: clean
 
 maintainer-clean: distclean
 
-scanner.c : scanner.l
-	$(LEX) -Pdf_ -oscanner.c scanner.l
-
 scanner.obj : scanner.c grammar.h
 
 grammar.h : grammar.c
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 515c364687..1876b70133 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -14,8 +14,13 @@ 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 $<
+
+.l.c:
+	$(LEX) -o$@ $<
 	
 LDFLAGS = $(PLUGIN_LDFLAGS)
 
@@ -109,8 +114,7 @@ distclean: clean
 
 maintainer-clean: distclean
 
-mate_parser.c : mate_parser.l
-	$(LEX) -Pdf_ -omate_parser.c mate_parser.l
+mate_parser.obj : mate_parser.c
 
 mate_grammar.h : mate_grammar.c
 mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index e58a2c99b9..89619a5213 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -14,9 +14,14 @@ 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 = \
@@ -46,11 +51,7 @@ ascend-grammar.c ascend-grammar.h : ascend-grammar.y
 
 ascend-scanner.obj : ascend-scanner.c ascend-grammar.h
 
-ascend-scanner.c : ascend-scanner.l
-	$(LEX) -Pascend -oascend-scanner.c ascend-scanner.l
-
-k12text.c : k12text.l
-	$(LEX) -PK12Text -ok12text.c k12text.l
+k12text.obj : k12text.c
 
 config.h	: config.h.win32 ..\config.nmake
 	sed -e s/@VERSION@/$(WTAP_VERSION)/ \