diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.nmake | 10 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.nmake | 8 |
2 files changed, 3 insertions, 15 deletions
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 \ |