diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-02-17 16:59:14 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-02-17 16:59:14 +0000 |
| commit | d205085350663e7cb6b086226620151d8a3d868d (patch) | |
| tree | 7bfc5fa00bc1d39709e69a8a0ca305124ea7e746 /Makefile.common | |
| parent | ed68db6e5d989e6af1f14108051645ee80d806fe (diff) | |
| download | wireshark-d205085350663e7cb6b086226620151d8a3d868d.tar.gz | |
Trying to fix the compile of ui/util.c on Windows by moving the
source file directly into the sources variable - there seems to
be a subtle difference between ui/util.c and epan/crypt/md5.c
svn path=/trunk/; revision=41052
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/Makefile.common b/Makefile.common index 388ecfc5c2..4028e57605 100644 --- a/Makefile.common +++ b/Makefile.common @@ -46,18 +46,17 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) # sources common for wireshark, tshark, and rawshark WIRESHARK_COMMON_SRC = \ - $(PLATFORM_SRC) \ + $(PLATFORM_SRC) \ capture-pcap-util.c \ - cfile.c \ - clopts_common.c \ + cfile.c \ + clopts_common.c \ disabled_protos.c \ frame_data_sequence.c \ - packet-range.c \ - print.c \ - ps.c \ + packet-range.c \ + print.c \ + ps.c \ sync_pipe_write.c \ - timestats.c \ - ui/util.c \ + timestats.c \ tap-megaco-common.c \ tap-rtp-common.c \ version_info.c @@ -67,25 +66,25 @@ WIRESHARK_COMMON_INCLUDES = \ svnversion.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ - cfile.h \ - clopts_common.h \ - cmdarg_err.h \ - console_io.h \ - color.h \ + cfile.h \ + clopts_common.hs \ + cmdarg_err.h \ + console_io.h \ + color.h \ disabled_protos.h \ - file.h \ - fileset.h \ + file.h \ + fileset.h \ frame_data_sequence.h \ - isprint.h \ - packet-range.h \ - print.h \ - ps.h \ - register.h \ - tempfile.h \ - timestats.h \ - ui/util.h \ + isprint.h \ + packet-range.h \ + print.h \ + ps.h \ + register.h \ + tempfile.h \ + timestats.h \ tap-megaco-common.h \ tap-rtp-common.h \ + ui/util.h \ version_info.h # sources common for wireshark and tshark, but not rawshark; @@ -162,7 +161,8 @@ wireshark_SOURCES = \ recent.c \ summary.c \ tempfile.c \ - u3.c + u3.c \ + ui/util.c # corresponding headers wireshark_INCLUDES = \ @@ -199,12 +199,14 @@ tshark_SOURCES = \ capture_opts.c \ tempfile.c \ tshark-tap-register.c \ - tshark.c + tshark.c \ + ui/util.c # rawshark specifics rawshark_SOURCES = \ $(WIRESHARK_COMMON_SRC) \ - rawshark.c + rawshark.c \ + ui/util.c # text2pcap specifics text2pcap_SOURCES = \ |