git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Turn around the sequence of PATH, so the former PATH will be in front of the newly...
[metze/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4e80ac84e597ee5f01636d2ec36c140580a9102f..da0c1bbc34e5bace2670b077347cf76658851fea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,12 +71,12 @@ EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
 EXTRA_SCRIPTS = idl2eth
 
 #
-# Ethereal configuration files are put in $(pkgdatadir).  It currently
-# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
+# Ethereal configuration files are put in $(pkgdatadir).
 #
 pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
        ethereal-filter.html capinfos.html editcap.html \
-       idl2eth.html mergecap.html text2pcap.html
+       idl2eth.html mergecap.html text2pcap.html \
+       cfilters colorfilters dfilters
 
 #
 # Install the Diameter DTD and XML files in the "diameter" subdirectory
@@ -86,6 +86,75 @@ diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
        nasreq.xml sunping.xml
 
+
+#
+# Install the RADIUS directory files in the "radius" subdirectory
+# of that directory.
+#
+radiusdir = $(pkgdatadir)/radius
+radius_DATA = \
+       radius/dictionary  \
+       radius/dictionary.3com  \
+       radius/dictionary.3gpp  \
+       radius/dictionary.3gpp2  \
+       radius/dictionary.acc  \
+       radius/dictionary.alcatel  \
+       radius/dictionary.alteon  \
+       radius/dictionary.altiga  \
+       radius/dictionary.aptis  \
+       radius/dictionary.ascend  \
+       radius/dictionary.bay  \
+       radius/dictionary.bintec  \
+       radius/dictionary.bristol  \
+       radius/dictionary.cablelabs  \
+       radius/dictionary.cabletron  \
+       radius/dictionary.cisco  \
+       radius/dictionary.cisco.bbsm  \
+       radius/dictionary.cisco.vpn3000  \
+       radius/dictionary.cisco.vpn5000  \
+       radius/dictionary.colubris  \
+       radius/dictionary.columbia_university  \
+       radius/dictionary.compat  \
+       radius/dictionary.cosine  \
+       radius/dictionary.erx  \
+       radius/dictionary.extreme  \
+       radius/dictionary.foundry  \
+       radius/dictionary.freeradius  \
+       radius/dictionary.gandalf  \
+       radius/dictionary.garderos  \
+       radius/dictionary.gemtek  \
+       radius/dictionary.itk  \
+       radius/dictionary.juniper  \
+       radius/dictionary.karlnet  \
+       radius/dictionary.livingston  \
+       radius/dictionary.localweb  \
+       radius/dictionary.merit  \
+       radius/dictionary.microsoft  \
+       radius/dictionary.mikrotik  \
+       radius/dictionary.navini  \
+       radius/dictionary.netscreen  \
+       radius/dictionary.nokia  \
+       radius/dictionary.nomadix  \
+       radius/dictionary.propel  \
+       radius/dictionary.quintum  \
+       radius/dictionary.redback  \
+       radius/dictionary.redcreek  \
+       radius/dictionary.shasta  \
+       radius/dictionary.shiva  \
+       radius/dictionary.sonicwall  \
+       radius/dictionary.springtide  \
+       radius/dictionary.t_systems_nova  \
+       radius/dictionary.telebit  \
+       radius/dictionary.trapeze  \
+       radius/dictionary.tunnel  \
+       radius/dictionary.unisphere  \
+       radius/dictionary.unix  \
+       radius/dictionary.usr  \
+       radius/dictionary.valemount  \
+       radius/dictionary.versanet  \
+       radius/dictionary.wispr  \
+       radius/dictionary.xedia
+
 PLATFORM_SRC = pcap-util-unix.c
 
 include Makefile.common
@@ -118,53 +187,6 @@ plugin_libs = \
 if ENABLE_STATIC
 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/docsis/packet-bpkmattr.o \
-       plugins/docsis/packet-bpkmreq.o \
-       plugins/docsis/packet-bpkmrsp.o \
-       plugins/docsis/packet-docsis.o \
-       plugins/docsis/packet-dsaack.o \
-       plugins/docsis/packet-dsareq.o \
-       plugins/docsis/packet-dsarsp.o \
-       plugins/docsis/packet-dscack.o \
-       plugins/docsis/packet-dscreq.o \
-       plugins/docsis/packet-dscrsp.o \
-       plugins/docsis/packet-dsdreq.o \
-       plugins/docsis/packet-dsdrsp.o \
-       plugins/docsis/packet-macmgmt.o \
-       plugins/docsis/packet-map.o \
-       plugins/docsis/packet-regack.o \
-       plugins/docsis/packet-regreq.o \
-       plugins/docsis/packet-regrsp.o \
-       plugins/docsis/packet-rngreq.o \
-       plugins/docsis/packet-rngrsp.o \
-       plugins/docsis/packet-tlv.o \
-       plugins/docsis/packet-uccreq.o \
-       plugins/docsis/packet-uccrsp.o \
-       plugins/docsis/packet-ucd.o \
-       plugins/enttec/packet-enttec.o \
-       plugins/giop/packet-cosnaming.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 \
-       plugins/opsi/packet-opsi.o \
-       plugins/pcli/packet-pcli.o \
-       plugins/rdm/packet-rdm.o \
-       plugins/rlm/packet-rlm.o \
-       plugins/rtnet/packet-rtnet.o \
-       plugins/rudp/packet-rudp.o \
-       plugins/v5ua/packet-v5ua.o
-
 else           # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
@@ -304,7 +326,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
 FORCE:
 
 svnversion.h: FORCE
-       $(PERL) $(srcdir)/make-version.pl
+       $(PERL) $(srcdir)/make-version.pl $(srcdir)
 
 #
 # Build the short version of the authors file for the about dialog
@@ -333,7 +355,7 @@ SUFFIXES = .sh
 #
 # Build "tethereal-tap-register.c", which contains a function
 # "register_all_tap_listeners()"
-# that calls the register routines for all tehtereal tap listeners.
+# that calls the register routines for all tethereal tap listeners.
 #
 # We do this by grepping through sources.
 #
@@ -347,7 +369,7 @@ SUFFIXES = .sh
 tethereal-tap-register.c: $(TETHEREAL_TAP_SRC) $(srcdir)/make-tapreg-dotc
        @echo Making tethereal-tap-register.c
        @$(srcdir)/make-tapreg-dotc tethereal-tap-register.c $(srcdir) $(TETHEREAL_TAP_SRC)
- 
+
 ps.c: print.ps rdps
        ./rdps $(srcdir)/print.ps ps.c
 
@@ -377,7 +399,7 @@ dftest_DEPENDENCIES = \
 dftest_LDADD = \
        $(ethereal_optional_objects)    \
        $(dftest_additional_libs)       \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
@@ -394,7 +416,8 @@ CLEANFILES =                \
        svnversion.h    \
        @rdps_bin@      \
        idl2eth         \
-       *~
+       *~              \
+       vgcore.pid*
 
 #
 # XXX - "ps.c" is distributed in the source tarballs; why is it in the
@@ -407,11 +430,19 @@ DISTCLEANFILES = \
        ps.c
 
 MAINTAINERCLEANFILES =         \
-       $(GENERATED_FILES)
+       $(GENERATED_FILES)      \
+       Makefile.in             \
+       aclocal.m4              \
+       config.h.in             \
+       configure               \
+       depcomp                 \
+       install-sh              \
+       ltmain.sh               \
+       missing
 
 EXTRA_DIST = \
        FAQ                     \
-       INSTALL.configure       \
+       INSTALL.configure       \
        Makefile.common         \
        Makefile.nmake          \
        README.aix              \
@@ -432,7 +463,11 @@ EXTRA_DIST = \
        capinfos.c              \
        capture-wpcap.c         \
        capture-wpcap.h         \
+       capture_wpcap_packet.c  \
+       capture_wpcap_packet.h  \
+       cfilters                \
        cleanbld.bat            \
+       colorfilters            \
        config.h.win32          \
        config.nmake            \
        debian/README.debian    \
@@ -445,15 +480,16 @@ EXTRA_DIST = \
        debian/postinst         \
        debian/prerm            \
        debian/rules            \
+       dfilters                \
        dictionary.dtd          \
        dictionary.xml          \
-       doc/Makefile.am         \
-       doc/Makefile.nmake      \
-       doc/README.capture      \
-       doc/README.design       \
-       doc/README.developer    \
-       doc/README.idl2eth      \
-       doc/README.plugins      \
+       doc/Makefile.am         \
+       doc/Makefile.nmake      \
+       doc/README.capture      \
+       doc/README.design       \
+       doc/README.developer    \
+       doc/README.idl2eth      \
+       doc/README.plugins      \
        doc/README.regression   \
        doc/README.tapping      \
        doc/README.tvbuff       \
@@ -574,19 +610,80 @@ EXTRA_DIST = \
        make-manuf              \
        make-tapreg-dotc        \
        make-version.pl         \
-       manuf                   \
+       manuf                   \
        manuf.tmpl              \
        mergecap.c              \
        mobileipv4.xml          \
        nasreq.xml              \
        perlnoutf.pl            \
-       print.ps                \
+       print.ps                \
+       radius/dictionary  \
+       radius/dictionary.3com  \
+       radius/dictionary.3gpp  \
+       radius/dictionary.3gpp2  \
+       radius/dictionary.acc  \
+       radius/dictionary.alcatel  \
+       radius/dictionary.alteon  \
+       radius/dictionary.altiga  \
+       radius/dictionary.aptis  \
+       radius/dictionary.ascend  \
+       radius/dictionary.bay  \
+       radius/dictionary.bintec  \
+       radius/dictionary.bristol  \
+       radius/dictionary.cablelabs  \
+       radius/dictionary.cabletron  \
+       radius/dictionary.cisco  \
+       radius/dictionary.cisco.bbsm  \
+       radius/dictionary.cisco.vpn3000  \
+       radius/dictionary.cisco.vpn5000  \
+       radius/dictionary.colubris  \
+       radius/dictionary.columbia_university  \
+       radius/dictionary.compat  \
+       radius/dictionary.cosine  \
+       radius/dictionary.erx  \
+       radius/dictionary.extreme  \
+       radius/dictionary.foundry  \
+       radius/dictionary.freeradius  \
+       radius/dictionary.gandalf  \
+       radius/dictionary.garderos  \
+       radius/dictionary.gemtek  \
+       radius/dictionary.itk  \
+       radius/dictionary.juniper  \
+       radius/dictionary.karlnet  \
+       radius/dictionary.livingston  \
+       radius/dictionary.localweb  \
+       radius/dictionary.merit  \
+       radius/dictionary.microsoft  \
+       radius/dictionary.mikrotik  \
+       radius/dictionary.navini  \
+       radius/dictionary.netscreen  \
+       radius/dictionary.nokia  \
+       radius/dictionary.nomadix  \
+       radius/dictionary.propel  \
+       radius/dictionary.quintum  \
+       radius/dictionary.redback  \
+       radius/dictionary.redcreek  \
+       radius/dictionary.shasta  \
+       radius/dictionary.shiva  \
+       radius/dictionary.sonicwall  \
+       radius/dictionary.springtide  \
+       radius/dictionary.t_systems_nova  \
+       radius/dictionary.telebit  \
+       radius/dictionary.trapeze  \
+       radius/dictionary.tunnel  \
+       radius/dictionary.unisphere  \
+       radius/dictionary.unix  \
+       radius/dictionary.usr  \
+       radius/dictionary.valemount  \
+       radius/dictionary.versanet  \
+       radius/dictionary.wispr  \
+       radius/dictionary.xedia \
        randpkt.c               \
        rdps.c                  \
        sunping.xml             \
-       text2pcap-scanner.l     \
-       text2pcap.c             \
-       text2pcap.h             \
+       text2pcap-scanner.l     \
+       text2pcap.c             \
+       text2pcap.h             \
        wka.tmpl
 
 if SETUID_INSTALL
@@ -701,6 +798,8 @@ rpm-package: dist
                mkdir -p BUILD RPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../ethereal.desktop ; \
+               ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
                cd .. ; \
                rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/RPMS." ; \
@@ -713,6 +812,8 @@ srpm-package: dist
                mkdir -p BUILD SRPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../ethereal.desktop ; \
+               ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
                cd .. ; \
                rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/SRPMS." ; \
Unnamed repository; edit this file to name it for gitweb.