Print adjusted length.

[obnox/wireshark/wip.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 143275d5bcea99983a5f85f7ad2a8404a48acb9e..306ea2d3bdd09720b2feb40cd85245c0b22cf96d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,9 +524,9 @@ SUFFIXES = .sh
 # The first argument is the directory in which the source files live.
 # All subsequent arguments are the files to scan.
 #
-tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/make-tapreg-dotc
+tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc
        @echo Making tshark-tap-register.c
-       @$(srcdir)/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
+       @$(srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
 
 ps.c: print.ps $(srcdir)/tools/rdps.py
        $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
@@ -675,11 +675,6 @@ EXTRA_DIST = \
        image/dn_arrow.xpm      \
        image/dumpcap.rc.in     \
        image/editcap.rc.in     \
-       image/expert_chat.xpm   \
-       image/expert_error.xpm  \
-       image/expert_none.xpm   \
-       image/expert_note.xpm   \
-       image/expert_warn.xpm   \
        image/file_dlg_win32.rc \
        image/hi16-app-wireshark.png    \
        image/hi32-app-wireshark.png    \
@@ -707,6 +702,8 @@ EXTRA_DIST = \
        image/stock_dialog_stop_48.xpm  \
        image/stock_dialog_warning_48.xpm       \
        image/text2pcap.rc.in   \
+       image/toolbar/analyze_24.xpm \
+       image/toolbar/audio_player_24.xpm       \
        image/toolbar/autoscroll_24.xpm \
        image/toolbar/capture_airpcap_16.xpm \
        image/toolbar/capture_capture_16.xpm \
@@ -723,6 +720,7 @@ EXTRA_DIST = \
        image/toolbar/checkbox_16.xpm   \
        image/toolbar/colorize_24.xpm   \
        image/toolbar/conversations_16.xpm      \
+       image/toolbar/decode_24.xpm     \
        image/toolbar/decode_as_16.xpm  \
        image/toolbar/display_filter_24.xpm     \
        image/toolbar/endpoints_16.xpm  \
@@ -746,26 +744,37 @@ EXTRA_DIST = \
        image/toolbar/modem_16.png      \
        image/toolbar/modem_16.xpm      \
        image/toolbar/network_bluetooth_16.png  \
-       image/toolbar/network_bluetooth_16.xpm  \
+       image/toolbar/network_usb.svg           \
+       image/toolbar/network_usb_16.png        \
        image/toolbar/network_virtual_16.xpm    \
        image/toolbar/network_wired_16.png      \
-       image/toolbar/network_wired_16.xpm      \
        image/toolbar/network_wireless_16.png   \
-       image/toolbar/network_wireless_16.xpm   \
        image/toolbar/resize_columns_24.xpm     \
+       image/toolbar/telephone_16.xpm  \
        image/toolbar/telephony_16.xpm  \
        image/toolbar/time_24.xpm       \
+       image/toolbar/voip_flow_24.xpm  \
        image/toolbar/web_support_24.xpm        \
        image/toolbar/wep_closed_24.xpm \
        image/toolbar/wiki_24.xpm       \
        image/tshark.rc.in      \
        image/up_arrow.xpm      \
-       image/wiresharkdoc.ico  \
+       image/voip_bg.xpm       \
+       image/voip_select.xpm   \
        image/wireshark.exe.manifest.in \
        image/wireshark.ico     \
-       image/wiresharkinst.ico \
        image/wireshark.rc.in   \
+       image/WiresharkDoc-128.png      \
+       image/WiresharkDoc-16.png       \
+       image/WiresharkDoc-24.png       \
+       image/WiresharkDoc-256.png      \
+       image/WiresharkDoc-32.png       \
+       image/WiresharkDoc-48.png       \
+       image/WiresharkDoc-64.png       \
+       image/wiresharkdoc.ico  \
+       image/wiresharkinst.ico \
        image/wiretap.rc.in     \
+       image/wsicon.svg        \
        image/wsicon16.png      \
        image/wsicon16.xpm      \
        image/wsicon256.png     \
@@ -775,23 +784,19 @@ EXTRA_DIST = \
        image/wsicon48.xpm      \
        image/wsicon64.png      \
        image/wsicon64.xpm      \
+       image/wsiconcap.svg     \
        image/wsiconcap16.xpm   \
        image/wsiconcap256.png  \
        image/wsiconcap32.xpm   \
        image/wsiconcap48.xpm   \
-       image/wsiconcap.svg     \
-       image/wsicondoc256.png  \
-       image/wsicondoc.svg     \
-       image/wsiconinst256.png \
        image/wsiconinst.svg    \
-       image/wsicon.svg        \
+       image/wsiconinst256.png \
        image/wslogo.eps        \
        image/wslogo.svg        \
-       image/wssplash.xpm      \
        image/wssplash-dev.xpm  \
+       image/wssplash.xpm      \
        ipmap.html      \
        make-manuf              \
-       make-tapreg-dotc        \
        make-version.pl         \
        manuf                   \
        manuf.tmpl              \
@@ -807,7 +812,6 @@ EXTRA_DIST = \
        text2pcap-scanner.l     \
        text2pcap.c             \
        text2pcap.h             \
-       tools/rdps.py   \
        services                \
        wireshark.desktop       \
        wka.tmpl