Various:

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

diff --git a/Makefile.am b/Makefile.am
index d2112e0a96f1084d8a4726c6a58182f38520aabb..8afe3f762539a50bf919d11f9672e684e5f33e8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,7 @@ diameter_DATA = \
        diameter/gqpolicy.xml \
        diameter/imscxdx.xml \
        diameter/mobileipv4.xml \
+       diameter/mobileipv6.xml \
        diameter/nasreq.xml \
        diameter/sip.xml \
        diameter/sunping.xml \
@@ -269,6 +270,7 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
        -dlopen plugins/giop/cosnaming.la \
        -dlopen plugins/giop/coseventcomm.la \
        -dlopen plugins/gryphon/gryphon.la \
+       -dlopen plugins/interlink/interlink.la \
        -dlopen plugins/irda/irda.la \
        -dlopen plugins/m2m/m2m.la \
        -dlopen plugins/mate/mate.la \
@@ -498,7 +500,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
 FORCE:
 
 svnversion.h: FORCE
-       LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
+       $(PERL) $(srcdir)/make-version.pl $(srcdir)
 
 #
 # Build shell scripts by doing variable substitution.
@@ -576,7 +578,7 @@ EXTRA_DIST = \
        README.macos            \
        README.tru64            \
        README.vmware           \
-       README.win32            \
+       README.windows          \
        aclocal-fallback/glib-2.0.m4 \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-flags           \
@@ -622,8 +624,6 @@ EXTRA_DIST = \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
        dfilters                \
-       docbook/Makefile.auto.am        \
-       docbook/ws.css          \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
@@ -817,14 +817,22 @@ EXTRA_DIST = \
        wireshark.desktop       \
        wka.tmpl
 
-if SETUID_INSTALL
 install-exec-hook:
-       -chmod +s $(DESTDIR)$(bindir)/dumpcap
+if HAVE_DUMPCAP_GROUP
+       -chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
+endif
+if SETCAP_INSTALL
+       -$(SETCAP) cap_net_raw,cap_net_admin+eip $(DESTDIR)$(bindir)/dumpcap
+       -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
 else
-install-exec-hook:
+if SETUID_INSTALL
+       -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
+       -chmod +s $(DESTDIR)$(bindir)/dumpcap
 endif
+endif
+
 
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
 
 if HAVE_PLUGINS
 SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
@@ -869,7 +877,7 @@ rpm-package: dist
                cd $(rpm_topdir) ; \
                mkdir -p BUILD RPMS SOURCES ; \
                cd SOURCES ; \
-               ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../$(distdir).tar.bz2 ; \
                ln -s ../../../wireshark.desktop ; \
                ln -s ../../../image/wsicon64.png wireshark.png ; \
                cd .. ; \
@@ -883,7 +891,7 @@ srpm-package: dist
                cd $(rpm_topdir) ; \
                mkdir -p BUILD SRPMS SOURCES ; \
                cd SOURCES ; \
-               ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../$(distdir).tar.bz2 ; \
                ln -s ../../../wireshark.desktop ; \
                ln -s ../../../image/wsicon64.png wireshark.png ; \
                cd .. ; \
@@ -919,6 +927,12 @@ osx-package: osx-app
                ./osx-dmg.sh ; \
        fi
 
+osx-install: osx-app
+       @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
+               echo "Copying Wireshark.app to /Applications" ; \
+               cp -pr $(srcdir)/packaging/macosx/Wireshark.app /Applications ;  \
+       fi
+
 clean-local:
        rm -rf $(top_stagedir)