git.samba.org
/
metze
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
[metze/wireshark/wip.git]
/
Makefile.common
diff --git
a/Makefile.common
b/Makefile.common
index d0c63f820b6419df87aa148b4ab22f08c08b0dda..635e8c4ff05e638458835820661e384f00fe1e4c 100644
(file)
--- a/
Makefile.common
+++ b/
Makefile.common
@@
-21,7
+21,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
+# Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
BUILT_HEADER_FILES = \
# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
BUILT_HEADER_FILES = \
@@
-44,10
+44,11
@@
GENERATED_C_FILES = \
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
# sources common for wireshark, tshark, and rawshark
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 \
$(PLATFORM_SRC) \
capture-pcap-util.c \
cfile.c \
+ cfutils.c \
clopts_common.c \
disabled_protos.c \
frame_data_sequence.c \
clopts_common.c \
disabled_protos.c \
frame_data_sequence.c \
@@
-61,14
+62,14
@@
WIRESHARK_COMMON_SRC = \
version_info.c
# corresponding headers
version_info.c
# corresponding headers
-
WIRESHARK_COMMON_INCLUDES =
\
+
SHARK_COMMON_INCLUDES =
\
svnversion.h \
capture-pcap-util.h \
capture-pcap-util-int.h \
cfile.h \
svnversion.h \
capture-pcap-util.h \
capture-pcap-util-int.h \
cfile.h \
+ cfutils.h \
clopts_common.h \
cmdarg_err.h \
clopts_common.h \
cmdarg_err.h \
- console_io.h \
color.h \
disabled_protos.h \
file.h \
color.h \
disabled_protos.h \
file.h \
@@
-83,7
+84,8
@@
WIRESHARK_COMMON_INCLUDES = \
timestats.h \
tap-megaco-common.h \
tap-rtp-common.h \
timestats.h \
tap-megaco-common.h \
tap-rtp-common.h \
- version_info.h
+ version_info.h \
+ ws_symbol_export.h
# sources common for wireshark and tshark, but not rawshark;
# these are for programs that capture traffic by running dumpcap
# sources common for wireshark and tshark, but not rawshark;
# these are for programs that capture traffic by running dumpcap
@@
-95,32
+97,33
@@
SHARK_COMMON_CAPTURE_SRC = \
# corresponding headers
SHARK_COMMON_CAPTURE_INCLUDES = \
capture_ifinfo.h \
# corresponding headers
SHARK_COMMON_CAPTURE_INCLUDES = \
capture_ifinfo.h \
+ capture_session.h \
capture_sync.h \
capture_ui_utils.h
# wireshark specifics
capture_sync.h \
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 \
capture_info.c \
$(SHARK_COMMON_CAPTURE_SRC) \
airpcap_loader.c \
capture.c \
capture_info.c \
- capture_opts.c \
+ capture_opts.c
\
color_filters.c \
color_filters.c \
- file.c \
+ file.c
\
fileset.c \
filters.c \
fileset.c \
filters.c \
- g711.c \
- merge.c \
+ g711.c \
+ iface_monitor.c \
+ merge.c \
proto_hier_stats.c \
proto_hier_stats.c \
- recent.c \
summary.c \
tempfile.c \
u3.c \
ws80211_utils.c
# corresponding headers
summary.c \
tempfile.c \
u3.c \
ws80211_utils.c
# corresponding headers
-
wireshark_INCLUDES =
\
+
WIRESHARK_COMMON_INCLUDES =
\
airpcap.h \
airpcap_loader.h \
capture.h \
airpcap.h \
airpcap_loader.h \
capture.h \
@@
-128,10
+131,11
@@
wireshark_INCLUDES = \
capture_opts.h \
color_filters.h \
filters.h \
capture_opts.h \
color_filters.h \
filters.h \
- g711.h \
+ g711.h
\
globals.h \
globals.h \
- log.h \
- merge.h \
+ iface_monitor.h \
+ log.h \
+ merge.h \
proto_hier_stats.h \
stat_menu.h \
summary.h \
proto_hier_stats.h \
stat_menu.h \
summary.h \
@@
-141,7
+145,7
@@
wireshark_INCLUDES = \
# tshark specifics
tshark_SOURCES = \
# tshark specifics
tshark_SOURCES = \
- $(
WIRESHARK_COMMON_SRC)
\
+ $(
SHARK_COMMON_SRC)
\
$(SHARK_COMMON_CAPTURE_SRC) \
capture_opts.c \
tempfile.c \
$(SHARK_COMMON_CAPTURE_SRC) \
capture_opts.c \
tempfile.c \
@@
-149,14
+153,19
@@
tshark_SOURCES = \
# rawshark specifics
rawshark_SOURCES = \
# rawshark specifics
rawshark_SOURCES = \
- $(
WIRESHARK_COMMON_SRC)
\
+ $(
SHARK_COMMON_SRC)
\
rawshark.c
# text2pcap specifics
text2pcap_SOURCES = \
rawshark.c
# text2pcap specifics
text2pcap_SOURCES = \
+ pcapio.c \
text2pcap.c \
text2pcap-scanner.l
text2pcap.c \
text2pcap-scanner.l
+text2pcap_INCLUDES = \
+ pcapio.h \
+ text2pcap.h
+
# mergecap specifics
mergecap_SOURCES = \
mergecap.c \
# mergecap specifics
mergecap_SOURCES = \
mergecap.c \
@@
-170,6
+179,12
@@
editcap_SOURCES = \
epan/nstime.c \
$(WTAP_PLUGIN_SOURCES)
epan/nstime.c \
$(WTAP_PLUGIN_SOURCES)
+# reordercap specifics
+reordercap_SOURCES = \
+ reordercap.c \
+ svnversion.h
+
+# capinfos specifics
capinfos_SOURCES = \
capinfos.c \
$(WTAP_PLUGIN_SOURCES)
capinfos_SOURCES = \
capinfos.c \
$(WTAP_PLUGIN_SOURCES)
@@
-185,9
+200,10
@@
randpkt_SOURCES = \
# dumpcap specifics
dumpcap_SOURCES = \
$(PLATFORM_SRC) \
# dumpcap specifics
dumpcap_SOURCES = \
$(PLATFORM_SRC) \
- capture_opts.c \
+ capture_opts.c
\
capture-pcap-util.c \
capture_stop_conditions.c \
capture-pcap-util.c \
capture_stop_conditions.c \
+ cfutils.c \
clopts_common.c \
conditions.c \
dumpcap.c \
clopts_common.c \
conditions.c \
dumpcap.c \
@@
-207,7
+223,7
@@
dumpcap_INCLUDES = \
# this target needed for distribution only
noinst_HEADERS = \
# this target needed for distribution only
noinst_HEADERS = \
- $(
WIRE
SHARK_COMMON_INCLUDES) \
+ $(SHARK_COMMON_INCLUDES) \
$(SHARK_COMMON_CAPTURE_INCLUDES) \
$(SHARK_COMMON_CAPTURE_INCLUDES) \
- $(
wireshark
_INCLUDES) \
+ $(
WIRESHARK_COMMON
_INCLUDES) \
$(dumpcap_INCLUDES)
$(dumpcap_INCLUDES)