diff options
author | Michael Mann <mmann78@netscape.net> | 2014-01-08 04:35:28 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-01-08 04:35:28 +0000 |
commit | bf284da2eef917f8bf55be3aad15bb296072bb77 (patch) | |
tree | fbf66f67fb32e3d49466867e62a1c07a03300283 /Makefile.am | |
parent | a6ed8a1de97a70668a8feaeade2a11cc4c93185f (diff) |
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)
This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!).
svn path=/trunk/; revision=54646
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c86f4637bf..48d63d9625 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,6 +38,7 @@ endif bin_PROGRAMS = \ @wireshark_bin@ \ @tshark_bin@ \ + @tfshark_bin@ \ @text2pcap_bin@ \ @mergecap_bin@ \ @capinfos_bin@ \ @@ -50,7 +51,7 @@ bin_PROGRAMS = \ @rawshark_bin@ \ @echld_test_bin@ -EXTRA_PROGRAMS = wireshark wireshark-qt tshark capinfos captype editcap \ +EXTRA_PROGRAMS = wireshark wireshark-qt tshark tfshark capinfos captype editcap \ mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \ wireshark_cxx echld_test @@ -361,6 +362,7 @@ wireshark_ldadd = \ ui/libui.a \ ui/libui_dirty.a \ codecs/libcodec.a \ + filetap/libfiletap.la \ wiretap/libwiretap.la \ epan/libwireshark.la \ wsutil/libwsutil.la \ @@ -448,6 +450,33 @@ tshark_LDADD = \ tshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) if ENABLE_STATIC +tfshark_LDFLAGS = -Wl,-static -all-static +else +tfshark_LDFLAGS = -export-dynamic +endif + +# Libraries and plugin flags with which to link tfshark. +tfshark_LDADD = \ + ui/cli/libcliui.a \ + ui/libui.a \ + filetap/libfiletap.la \ + epan/libwireshark.la \ + wsutil/libwsutil.la \ + @SSL_LIBS@ \ + $(plugin_ldadd) \ + @GLIB_LIBS@ -lm \ + @PCAP_LIBS@ \ + @SOCKET_LIBS@ \ + @NSL_LIBS@ \ + @KRB5_LIBS@ \ + @SYSTEMCONFIGURATION_FRAMEWORKS@ \ + @COREFOUNDATION_FRAMEWORKS@ \ + @PY_LIBS@ \ + @LIBGNUTLS_LIBS@ \ + @LIBSMI_LDFLAGS@ +tfshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) + +if ENABLE_STATIC rawshark_LDFLAGS = -Wl,-static -all-static else rawshark_LDFLAGS = -export-dynamic @@ -722,6 +751,7 @@ EXTRA_DIST = \ dumpcap.c \ editcap.c \ epan/print.ps \ + filetap/CMakeLists.txt \ fix/FIX.xml \ fix/FIX40.xml \ fix/FIX41.xml \ @@ -802,6 +832,7 @@ EXTRA_DIST = \ image/expert_note.png \ image/expert_warn.png \ image/file_dlg_win32.rc \ + image/filetap.rc.in \ image/hi16-app-wireshark.png \ image/hi32-app-wireshark.png \ image/hi48-app-wireshark.png \ @@ -1037,12 +1068,12 @@ endif endif -DIST_SUBDIRS = asn1 codecs doc epan echld ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook +DIST_SUBDIRS = asn1 codecs doc epan echld filetap ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook if HAVE_PLUGINS -SUBDIRS = tools wsutil wiretap epan @echld_dir@ plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc +SUBDIRS = tools wsutil wiretap filetap epan @echld_dir@ plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc else -SUBDIRS = tools wsutil wiretap epan @echld_dir@ packaging help ui @wireshark_SUBDIRS@ ui/cli . doc +SUBDIRS = tools wsutil wiretap filetap epan @echld_dir@ packaging help ui @wireshark_SUBDIRS@ ui/cli . doc endif help/faq.txt: $(srcdir)/help/faq.py @@ -1177,6 +1208,7 @@ clean-local: rm -rf $(top_stagedir) dumpabi: + $(MAKE) -C filetap dumpabi-libfiletap $(MAKE) -C wiretap dumpabi-libwiretap $(MAKE) -C epan dumpabi-libwireshark $(MAKE) -C wsutil dumpabi-libwsutil @@ -1189,6 +1221,7 @@ checkapi_local: checkapi: checkapi_local cd wiretap && $(MAKE) checkapi + cd filetap && $(MAKE) checkapi cd codecs && $(MAKE) checkapi cd ui && $(MAKE) checkapi cd ui/gtk && $(MAKE) checkapi |