diff options
author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-06 20:48:36 +0000 |
---|---|---|
committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-06 20:48:36 +0000 |
commit | 388aaadcb79b2cf20a84e5a8e6ca667d978e7766 (patch) | |
tree | ee016cb73972208ec742324de7612146d143522e /Makefile.nmake | |
parent | 77449b1085568d8d79da09040f6e8ff8ba007a00 (diff) | |
download | wireshark-388aaadcb79b2cf20a84e5a8e6ca667d978e7766.tar.gz |
Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.
svn path=/trunk/; revision=10807
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 43b506b771..4f8c17bee7 100644 --- a/Makefile.nmake +++ b/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.415 2004/04/23 05:19:49 guy Exp $ +# $Id: Makefile.nmake,v 1.416 2004/05/06 20:48:35 obiot Exp $ include config.nmake include <win32.mak> @@ -103,7 +103,7 @@ EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.ex RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res -all: tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc +all: config.h tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc packaging: all cd packaging |