# automake will arrange that the Makefile define it as the union of all
# the "man{section}_MANS" variables.
#
-bin_PROGRAMS = @ethereal_bin@ @capinfo_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
+bin_PROGRAMS = @ethereal_bin@ @capinfos_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @capinfo_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
+man1_MANS = @ethereal_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
man4_MANS = @etherealfilter_man@
man_MANS =
-EXTRA_PROGRAMS = ethereal tethereal capinfo editcap mergecap dftest \
+EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
randpkt text2pcap
EXTRA_SCRIPTS = idl2eth
# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
#
pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
- ethereal-filter.html capinfo.html editcap.html \
+ ethereal-filter.html capinfos.html editcap.html \
idl2eth.html mergecap.html text2pcap.html
#
# of that directory.
#
diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \
+diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
nasreq.xml sunping.xml
PLATFORM_SRC = pcap-util-unix.c
if HAVE_PLUGINS
plugin_libs = \
plugins/acn/acn.la \
+ plugins/agentx/agentx.la \
plugins/artnet/artnet.la \
plugins/asn1/asn1.la \
plugins/ciscosm/ciscosm.la \
plugins/v5ua/v5ua.la
if ENABLE_STATIC
-plugin_ldadd = \
+plugin_ldadd = $(plugin_libs)
+
+dummyddd = \
plugins/acn/packet-acn.o \
+ plugins/agentx/packet-agentx.o \
plugins/artnet/packet-artnet.o \
plugins/asn1/packet-asn1.o \
plugins/ciscosm/packet-sm.o \
plugins/giop/packet-coseventcomm.o \
plugins/gryphon/packet-gryphon.o \
plugins/irda/packet-irda.o \
+ plugins/irda/packet-ircomm.o \
+ plugins/irda/packet-sir.o \
plugins/lwres/packet-lwres.o \
plugins/megaco/packet-megaco.o \
plugins/mgcp/packet-mgcp.o \
plugin_ldadd = \
"-dlopen" self \
"-dlopen" plugins/acn/acn.la \
+ "-dlopen" plugins/agentx/agentx.la \
"-dlopen" plugins/artnet/artnet.la \
"-dlopen" plugins/asn1/asn1.la \
"-dlopen" plugins/ciscosm/ciscosm.la \
mergecap_DEPENDENCIES = wiretap/libwiretap.la
# This is the automake dependency variable for the executable
-capinfo_DEPENDENCIES = wiretap/libwiretap.la
+capinfos_DEPENDENCIES = wiretap/libwiretap.la
editcap_DEPENDENCIES = wiretap/libwiretap.la
# This automake variable adds to the link-line for the executable
-capinfo_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
+capinfos_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
editcap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
mergecap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
# Build the short version of the authors file for the about dialog
#
AUTHORS-SHORT: AUTHORS make-authors-short.pl
- $(PERL) $(srcdir)/make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+ $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(srcdir)/AUTHORS > AUTHORS-SHORT
+
+#
+# Build the short version of the authors file with formatting codes for the
+# man page
+#
+AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
+ $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
#
# Build shell scripts by doing variable substitution.
dftest_LDFLAGS = -export-dynamic
-CLEANFILES = \
- svnversion.h \
- @rdps_bin@ \
- idl2eth
+#
+# XXX - "svnversion.h" is distributed in the release tarball; should
+# we be deleting it with "make clean", or should we only do that with
+# "make maintainer-clean"?
+#
+CLEANFILES = \
+ svnversion.h \
+ @rdps_bin@ \
+ idl2eth \
+ *~
+#
+# XXX - "ps.c" is distributed in the source tarballs; why is it in the
+# list of files removed by "make distclean"? (It's deliberately
+# included in that list.)
+#
DISTCLEANFILES = \
- ps.c \
- *~
+ AUTHORS-SHORT \
+ AUTHORS-SHORT-FORMAT \
+ ps.c
MAINTAINERCLEANFILES = \
- ps.c
+ $(GENERATED_FILES)
EXTRA_DIST = \
- AUTHORS-SHORT \
FAQ \
INSTALL.configure \
Makefile.common \
README.tru64 \
README.vmware \
README.win32 \
- TODO \
aclocal-fallback/glib-2.0.m4 \
aclocal-fallback/glib.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk.m4 \
aclocal-flags \
autogen.sh \
- capinfo.c \
+ capinfos.c \
capture-wpcap.c \
capture-wpcap.h \
cleanbld.bat \
doc/README.tapping \
doc/README.tvbuff \
doc/README.xml-output \
- doc/capinfo.pod \
+ doc/capinfos.pod \
doc/dfilter2pod.pl \
doc/editcap.pod \
doc/ethereal-filter.pod.template \
doc/randpkt.txt \
doc/tethereal.pod \
doc/text2pcap.pod \
+ docbook/Makefile.auto.am \
doxygen.cfg.in \
editcap.c \
epan/libethereal.def \
image/Ethereal.icns \
image/Makefile.nmake \
image/README.image \
- image/capinfo.rc.in \
+ image/capinfos.rc.in \
image/clist_ascend.xpm \
image/clist_descend.xpm \
image/dn_arrow.xpm \
image/icon_layout_5.xpm \
image/icon_layout_6.xpm \
image/wiretap.rc.in \
+ imscxdx.xml \
+ make-authors-format.pl \
make-authors-short.pl \
make-manuf \
make-tapreg-dotc \
mergecap.c \
mobileipv4.xml \
nasreq.xml \
+ perlnoutf.pl \
print.ps \
randpkt.c \
rdps.c \
SUBDIRS = tools wiretap doc epan packaging help @ethereal_SUBDIRS@
endif
-ethereal.1: doc/ethereal.pod AUTHORS-SHORT
+ethereal.1: doc/ethereal.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
$(MAKE) ../ethereal.1 )
(cd doc ; \
$(MAKE) ../ethereal-filter.4 )
-capinfo.1: doc/capinfo.pod
+capinfos.1: doc/capinfos.pod
(cd doc ; \
- $(MAKE) ../capinfo.1 )
+ $(MAKE) ../capinfos.1 )
editcap.1: doc/editcap.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../text2pcap.1 )
-ethereal.html: doc/ethereal.pod AUTHORS-SHORT
+ethereal.html: doc/ethereal.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
$(MAKE) ../ethereal.html )
(cd doc ; \
$(MAKE) ../ethereal-filter.html )
-capinfo.html: doc/capinfo.pod
+capinfos.html: doc/capinfos.pod
(cd doc ; \
- $(MAKE) ../capinfo.html )
+ $(MAKE) ../capinfos.html )
editcap.html: doc/editcap.pod
(cd doc ; \
git.samba.org / obnox / wireshark / wip.git / blobdiff