aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
authorOlivier Biot <obiot.ethereal@gmail.com>2004-05-06 20:48:36 +0000
committerOlivier Biot <obiot.ethereal@gmail.com>2004-05-06 20:48:36 +0000
commit388aaadcb79b2cf20a84e5a8e6ca667d978e7766 (patch)
treeee016cb73972208ec742324de7612146d143522e /epan/dfilter
parent77449b1085568d8d79da09040f6e8ff8ba007a00 (diff)
Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake. svn path=/trunk/; revision=10807
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/Makefile.nmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 3c5474e7b6..7581de5f8b 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.12 2004/01/22 19:27:59 ulfl Exp $
+# $Id: Makefile.nmake,v 1.13 2004/05/06 20:48:36 obiot Exp $
include ..\..\config.nmake
@@ -37,12 +37,12 @@ OBJECTS = \
dfilter.lib : $(OBJECTS)
lib /out:dfilter.lib $(OBJECTS)
-$(OBJECTS): ..\config.h
+$(OBJECTS): ..\..\config.h
-..\config.h:
- cd ..
- $(MAKE) -f makefile.nmake config.h
- cd dfilter
+..\..\config.h: ..\..\config.h.win32 ..\..\config.nmake
+ cd ..\..
+ $(MAKE) -f Makefile.nmake config.h
+ cd epan\dfilter
clean:
rm -f $(OBJECTS) dfilter.lib $(PDB_FILE)