diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 09:49:36 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 09:49:36 +0000 |
| commit | a85e91903a06ae3f1bdf9e91dc8c55d5b10bd0b1 (patch) | |
| tree | 6cba60a4e35460d49c5d067084469351f099bd2d /Makefile.nmake | |
| parent | f098b908328920f057d81872aa6c6b1797e416d8 (diff) | |
| download | wireshark-a85e91903a06ae3f1bdf9e91dc8c55d5b10bd0b1.tar.gz | |
add merge.obj to the linking of mergecap.exe
svn path=/trunk/; revision=11193
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index acc81b1551..a3f92eb85f 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.420 2004/05/21 17:25:32 ulfl Exp $ +# $Id: Makefile.nmake,v 1.421 2004/06/20 09:49:36 ulfl Exp $ include config.nmake include <win32.mak> @@ -173,10 +173,10 @@ editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).li /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res << -mergecap.exe : config.h cvsversion.h mergecap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res +mergecap.exe : config.h cvsversion.h mergecap.obj merge.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res @echo Linking $@ $(LINK) @<< - /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj getopt.obj $(mergecap_LIBS) image\mergecap.res + /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj getopt.obj $(mergecap_LIBS) image\mergecap.res << text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res |