diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-12-13 02:59:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-12-13 02:59:16 +0000 |
| commit | e21fd7c0ceb6143a371f780aa044cd43861db975 (patch) | |
| tree | 9f53262bf5f5379f8adccdebdf0aa3347f87da4a /Makefile.am | |
| parent | ed9865a779df1ab283aab8b69b5bcb51db4c079a (diff) | |
Add a "captype" file that just reports the type of a capture file, based
on what libwiretap thinks it is.
Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.
svn path=/trunk/; revision=54015
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 6a46f4c9ac..3e81b7e958 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ bin_PROGRAMS = \ @text2pcap_bin@ \ @mergecap_bin@ \ @capinfos_bin@ \ + @captype_bin@ \ @editcap_bin@ \ @randpkt_bin@ \ @dftest_bin@ \ @@ -49,9 +50,9 @@ bin_PROGRAMS = \ @rawshark_bin@ \ @echld_test_bin@ -EXTRA_PROGRAMS = wireshark wireshark-qt tshark capinfos editcap mergecap \ - dftest randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx \ - echld_test +EXTRA_PROGRAMS = wireshark wireshark-qt tshark capinfos captype editcap \ + mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \ + wireshark_cxx echld_test # # Wireshark configuration files are put in $(pkgdatadir). @@ -501,6 +502,13 @@ capinfos_LDADD = \ @LIBGCRYPT_LIBS@ capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) +# Libraries with which to link captype. +captype_LDADD = \ + wiretap/libwiretap.la \ + wsutil/libwsutil.la \ + @GLIB_LIBS@ +captype_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) + # Libraries with which to link editcap. editcap_LDADD = \ wiretap/libwiretap.la \ @@ -671,6 +679,7 @@ EXTRA_DIST = \ adns_dll.rc \ autogen.sh \ capinfos.c \ + captype.c \ capture_win_ifnames.c \ capture_win_ifnames.h \ capture-wpcap.c \ @@ -759,6 +768,7 @@ EXTRA_DIST = \ idl/parlay/ui_data.idl \ idl/parlay/ui_interfaces.idl \ image/capinfos.rc.in \ + image/captype.rc.in \ image/capture_comment.svg \ image/capture_comment_add.png \ image/capture_comment_disabled.png \ |