diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-25 19:51:53 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-25 19:51:53 +0000 |
| commit | fd95d841b8c264165107652a87c3948e69378819 (patch) | |
| tree | cc7309c65f242844a7c4ee97232ba67b4b34b339 /Makefile.nmake | |
| parent | 8b9135e9b5ce7480eff2558b3f0025bb41bd34fb (diff) | |
Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./configure now accepts:
--with-gtk2 : enabled by default; exclusive of --with-gtk3
--with-gtk3 : disabled by default; exclusive of --with-gtk2
--with-qt : disabled by default, can be specified with gtk
--enable-wireshark : controls whether *any* GUI is built
If Qt is enabled then a new program is created: "wireshark-qt". "wireshark"
remains the Gtk+ version.
svn path=/trunk/; revision=50147
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 61989c1d9c..0aac1709e9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -60,7 +60,7 @@ WTAP_PLUGIN_SOURCES = \ include Makefile.common -wireshark_OBJECTS = $(wireshark_SOURCES:.c=.obj) +wireshark_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj) tshark_OBJECTS = $(tshark_SOURCES:.c=.obj) rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj) ###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj) @@ -1287,7 +1287,7 @@ install-all: install-generated-files checkapi_local: $(PERL) tools/checkAPIs.pl -build \ - $(wireshark_SOURCES) \ + $(WIRESHARK_COMMON_SRC) \ $(TSHARK_TAP_SRC) \ # $(EXTRA_wireshark_SOURCES) |