diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-24 21:51:40 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-24 21:51:40 +0000 |
| commit | e6f82792a9b7bdf86809a7a88dca64793098d2d7 (patch) | |
| tree | 86486f5886225eedf4e9e97e8f3ead9b3853076b /Makefile.nmake | |
| parent | 64a5a77b6cfd9e037b5de5fe69dc4cc7161458fe (diff) | |
Update the Makefile.nmake files to reflect the move of "int-64bit.c" to
the "epan" subdirectory.
Include "strptime.obj" in the list of object files used to build
"text2pcap.exe".
svn path=/trunk/; revision=4258
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2cec52ef22..9283fd5971 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.144 2001/11/24 08:14:10 guy Exp $ +# $Id: Makefile.nmake,v 1.145 2001/11/24 21:51:38 guy Exp $ include config.nmake include <win32.mak> @@ -249,7 +249,6 @@ ETHEREAL_COMMON_OBJECTS = \ follow.obj \ getopt.obj \ in_cksum.obj \ - int-64bit.obj \ ipproto.obj \ pcap-util.obj \ prefs.obj \ @@ -353,7 +352,7 @@ mergecap.exe : config.h mergecap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION). 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 image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res << dftest.exe : $(dftest_OBJECTS) $(EXTRA_OBJECTS) |