diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-10-16 18:28:27 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-10-16 18:28:27 +0000 |
| commit | b33945ca1f7e0d0bbe8c807c8dc4d6f32c14659e (patch) | |
| tree | dc8650c1e008e61bead9322cd05f05a1f5c63498 /Makefile.nmake | |
| parent | 0f82a3e7e81e96ba7ecd993688183e34bbf5bd71 (diff) | |
text2pcap now depends on libwiretap (for eth_fopen()) but only on Windows. Make it depend on libwiretap on *NIX, too, only to keep things in sync.
svn path=/trunk/; revision=23209
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 88ea85b62e..9656019dea 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -87,6 +87,10 @@ mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) +text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ + wsock32.lib user32.lib \ + $(GLIB_LIBS) + dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) @@ -243,10 +247,10 @@ mergecap.exe : $(LIBS_CHECK) config.h svnversion.h mergecap.obj merge.obj getop mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 !ENDIF -text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res +text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib strptime.obj image\text2pcap.res @echo Linking $@ $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj $(text2pcap_LIBS) strptime.obj image\text2pcap.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 |