diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-03 02:21:18 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-03 09:22:24 +0000 |
| commit | 1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd (patch) | |
| tree | 938b6d3fb73ef5c1a7cac3c71e6bb70cf0b5aac2 /Makefile.nmake | |
| parent | 1692c520ef8ffec43c2c86456e03edd547b0e9a4 (diff) | |
| download | wireshark-1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd.tar.gz wireshark-1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd.tar.bz2 wireshark-1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd.zip | |
We have to include version_info.obj manually in the dependencies for text2pcap.
Add a comment indicating why we're not generating text2pcap_OBJECTS from
text2pcap_SOURCES and using that.
Change-Id: I8235080c3ea2bb31861a9c4f5aee9e6ce6a0808c
Reviewed-on: https://code.wireshark.org/review/2801
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4451eadbce..5825a2295f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -60,6 +60,10 @@ wireshark_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj) tshark_OBJECTS = $(tshark_SOURCES:.c=.obj) tfshark_OBJECTS = $(tfshark_SOURCES:.c=.obj) rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj) +# +# XXX - one of the files in text2pcap_SOURCES is a .l file, so +# this doesn't work. +# ###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj) mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj) editcap_OBJECTS = $(editcap_SOURCES:.c=.obj) @@ -401,7 +405,7 @@ reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj wsutil\libwsutil.lib wir mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 !ENDIF -text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj pcapio.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res +text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj pcapio.obj version_info.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res @echo Linking $@ $(LINK) @<< /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj pcapio.obj $(text2pcap_LIBS) image\text2pcap.res |