forked from osmocom/wireshark
Get rid of trailing whitespace.
svn path=/trunk/; revision=27255
This commit is contained in:
parent
c53d96ac3b
commit
8ab2055892
21
Makefile.am
21
Makefile.am
|
@ -76,6 +76,7 @@ bin_PROGRAMS = \
|
|||
@randpkt_bin@ \
|
||||
@dftest_bin@ \
|
||||
@dumpcap_bin@ \
|
||||
@dumpcapng_bin@ \
|
||||
@rawshark_bin@
|
||||
bin_SCRIPTS = @idl2wrs_bin@
|
||||
|
||||
|
@ -93,7 +94,7 @@ man4_MANS = @wiresharkfilter_man@
|
|||
man_MANS =
|
||||
|
||||
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
|
||||
randpkt text2pcap dumpcap rawshark
|
||||
randpkt text2pcap dumpcap dumpcapng rawshark
|
||||
EXTRA_SCRIPTS = idl2wrs
|
||||
|
||||
idl2wrs: tools/idl2wrs.sh Makefile
|
||||
|
@ -477,6 +478,19 @@ dumpcap_LDADD = \
|
|||
@LIBCAP_LIBS@
|
||||
dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
# Libraries with which to link dumpcap-ng.
|
||||
dumpcapng_LDADD = \
|
||||
wiretap/libwiretap.la \
|
||||
wsutil/libwsutil.la \
|
||||
@INET_NTOP_LO@ \
|
||||
@GLIB_LIBS@ \
|
||||
@PCAP_LIBS@ \
|
||||
@SOCKET_LIBS@ \
|
||||
@NSL_LIBS@ \
|
||||
@FRAMEWORKS@ \
|
||||
@LIBGCRYPT_LIBS@ \
|
||||
@LIBCAP_LIBS@
|
||||
|
||||
# Common headers
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
|
||||
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)
|
||||
|
@ -636,6 +650,7 @@ EXTRA_DIST = \
|
|||
docbook/ws.css \
|
||||
doxygen.cfg.in \
|
||||
dumpcap.c \
|
||||
dumpcapng.c \
|
||||
editcap.c \
|
||||
wireshark.desktop \
|
||||
idl/cosnaming.idl \
|
||||
|
@ -669,7 +684,7 @@ EXTRA_DIST = \
|
|||
idl/parlay/README.parlay \
|
||||
idl/parlay/termcap.idl \
|
||||
idl/parlay/ui_data.idl \
|
||||
idl/parlay/ui_interfaces.idl \
|
||||
idl/parlay/ui_interfaces.idl \
|
||||
image/capinfos.rc.in \
|
||||
image/clist_ascend.xpm \
|
||||
image/clist_descend.xpm \
|
||||
|
@ -807,7 +822,7 @@ EXTRA_DIST = \
|
|||
|
||||
if SETUID_INSTALL
|
||||
install-exec-hook:
|
||||
-chmod +s $(DESTDIR)$(bindir)/dumpcap
|
||||
-chmod +s $(DESTDIR)$(bindir)/dumpcap $(DESTDIR)$(bindir)/dumpcapng
|
||||
else
|
||||
install-exec-hook:
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue