diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-12-01 11:35:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-12-01 11:35:27 +0000 |
| commit | ffebed7a167c371d06942361b3ce981be2d317d6 (patch) | |
| tree | 0b78ae078197dc87c815d85740ebb6720d65ad34 /Makefile.nmake | |
| parent | cecacdb16fe45dfb52837dbebe1bbc9532556285 (diff) | |
| download | wireshark-ffebed7a167c371d06942361b3ce981be2d317d6.tar.gz wireshark-ffebed7a167c371d06942361b3ce981be2d317d6.tar.bz2 wireshark-ffebed7a167c371d06942361b3ce981be2d317d6.zip | |
From Francisco Alcoba: link with setargv.obj so that wildcards are
expanded in the command line.
svn path=/trunk/; revision=12635
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1fd90984c1..414d63ebb8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -42,6 +42,8 @@ dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) +command_line_OBJECTS = setargv.obj + EXTRA_OBJECTS = \ # snprintf.obj \ # strerror.obj \ @@ -165,31 +167,31 @@ ethereal-gtk2.exe : config.h svnversion.h $(ethereal_OBJECTS) epan gtk2 image\et tethereal.exe : config.h svnversion.h $(tethereal_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ $(LINK) @<< - /OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) image\tethereal.res + /OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(command_line_OBJECTS) image\tethereal.res << capinfos.exe : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res @echo Linking $@ $(LINK) @<< - /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(capinfos_LIBS) image\capinfos.res + /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(command_line_OBJECTS) $(capinfos_LIBS) image\capinfos.res << editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res @echo Linking $@ $(LINK) @<< - /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res + /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res << mergecap.exe : config.h svnversion.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 merge.obj getopt.obj $(mergecap_LIBS) image\mergecap.res + /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) $(mergecap_LIBS) image\mergecap.res << text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj 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 strptime.obj $(command_line_OBJECTS) image\text2pcap.res << dftest.exe : $(dftest_OBJECTS) epan @@ -199,7 +201,7 @@ dftest.exe : $(dftest_OBJECTS) epan randpkt.exe : $(randpkt_OBJECTS) $(LINK) @<< - /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) + /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) $(command_line_OBJECTS) << config.h : config.h.win32 config.nmake |