replace *a lot* of file related calls by their GLib counterparts. This is necessary...

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

diff --git a/Makefile.am b/Makefile.am
index f46d40d0a944747164696d7e807f5948a3cd35dd..6a3ee13d9a61ee795e7dc8608584430ecdb81fb9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,9 +83,24 @@ pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
 # of that directory.
 #
 diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
-       nasreq.xml sunping.xml
+diameter_DATA = \
+       diameter/dictionary.dtd \
+       diameter/dictionary.xml \
+       diameter/imscxdx.xml \
+       diameter/mobileipv4.xml \
+       diameter/nasreq.xml \
+       diameter/sunping.xml
 
+#
+# Install the DTDs directory files in the "dtds" subdirectory
+# of that directory
+#
+dtdsdir = $(pkgdatadir)/dtds
+dtds_DATA = \
+       dtds/dc.dtd \
+       dtds/itunes.dtd \
+       dtds/rss.dtd \
+       dtds/smil.dtd
 
 #
 # Install the RADIUS directory files in the "radius" subdirectory
@@ -116,6 +131,7 @@ radius_DATA = \
        radius/dictionary.columbia_university  \
        radius/dictionary.compat  \
        radius/dictionary.cosine  \
+       radius/dictionary.ericsson  \
        radius/dictionary.erx  \
        radius/dictionary.extreme  \
        radius/dictionary.foundry  \
@@ -416,7 +432,8 @@ CLEANFILES =                \
        svnversion.h    \
        @rdps_bin@      \
        idl2eth         \
-       *~
+       *~              \
+       vgcore.pid*
 
 #
 # XXX - "ps.c" is distributed in the source tarballs; why is it in the
@@ -465,7 +482,6 @@ EXTRA_DIST = \
        capture_wpcap_packet.c  \
        capture_wpcap_packet.h  \
        cfilters                \
-       cleanbld.bat            \
        colorfilters            \
        config.h.win32          \
        config.nmake            \
@@ -480,8 +496,6 @@ EXTRA_DIST = \
        debian/prerm            \
        debian/rules            \
        dfilters                \
-       dictionary.dtd          \
-       dictionary.xml          \
        doc/Makefile.am         \
        doc/Makefile.nmake      \
        doc/README.capture      \
@@ -547,6 +561,7 @@ EXTRA_DIST = \
        image/stock_dialog_warning_48.xpm       \
        image/stock_dialog_question_48.xpm      \
        image/stock_dialog_info_48.xpm  \
+       image/stock_dialog_stop_48.xpm  \
        image/tethereal.rc.in   \
        image/text2pcap.rc.in   \
        image/toolbar/autoscroll_24.xpm \
@@ -603,7 +618,6 @@ EXTRA_DIST = \
        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              \
@@ -612,74 +626,13 @@ EXTRA_DIST = \
        manuf                   \
        manuf.tmpl              \
        mergecap.c              \
-       mobileipv4.xml          \
-       nasreq.xml              \
        perlnoutf.pl            \
        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 \
+       $(diameter_DATA)        \
+       $(dtds_DATA)            \
+       $(radius_DATA)          \
        randpkt.c               \
        rdps.c                  \
-       sunping.xml             \
        text2pcap-scanner.l     \
        text2pcap.c             \
        text2pcap.h             \
@@ -797,6 +750,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." ; \
@@ -809,6 +764,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." ; \