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.common | |
| 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.common')
| -rw-r--r-- | Makefile.common | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common index a22b3c7c2e..635e8c4ff0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -44,7 +44,7 @@ GENERATED_C_FILES = \ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) # sources common for wireshark, tshark, and rawshark -WIRESHARK_COMMON_SRC = \ +SHARK_COMMON_SRC = \ $(PLATFORM_SRC) \ capture-pcap-util.c \ cfile.c \ @@ -62,7 +62,7 @@ WIRESHARK_COMMON_SRC = \ version_info.c # corresponding headers -WIRESHARK_COMMON_INCLUDES = \ +SHARK_COMMON_INCLUDES = \ svnversion.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ @@ -102,8 +102,8 @@ SHARK_COMMON_CAPTURE_INCLUDES = \ capture_ui_utils.h # wireshark specifics -wireshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ +WIRESHARK_COMMON_SRC = \ + $(SHARK_COMMON_SRC) \ $(SHARK_COMMON_CAPTURE_SRC) \ airpcap_loader.c \ capture.c \ @@ -123,7 +123,7 @@ wireshark_SOURCES = \ ws80211_utils.c # corresponding headers -wireshark_INCLUDES = \ +WIRESHARK_COMMON_INCLUDES = \ airpcap.h \ airpcap_loader.h \ capture.h \ @@ -145,7 +145,7 @@ wireshark_INCLUDES = \ # tshark specifics tshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ + $(SHARK_COMMON_SRC) \ $(SHARK_COMMON_CAPTURE_SRC) \ capture_opts.c \ tempfile.c \ @@ -153,7 +153,7 @@ tshark_SOURCES = \ # rawshark specifics rawshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ + $(SHARK_COMMON_SRC) \ rawshark.c # text2pcap specifics @@ -223,7 +223,7 @@ dumpcap_INCLUDES = \ # this target needed for distribution only noinst_HEADERS = \ - $(WIRESHARK_COMMON_INCLUDES) \ + $(SHARK_COMMON_INCLUDES) \ $(SHARK_COMMON_CAPTURE_INCLUDES) \ - $(wireshark_INCLUDES) \ + $(WIRESHARK_COMMON_INCLUDES) \ $(dumpcap_INCLUDES) |