Get rid of C++-style comments (even inside "#if 0"/"#endif", the API

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

diff --git a/Makefile.am b/Makefile.am
index 94cc3e256adbf45b59281c1a2e744b16cb1f167e..fa305790bc81b622a39426ef2ed42d96eeeb94c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -428,7 +428,8 @@ mergecap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 capinfos_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
-       @GLIB_LIBS@
+       @GLIB_LIBS@                     \
+       @LIBGCRYPT_LIBS@
 capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link editcap.
@@ -497,7 +498,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.
@@ -621,8 +622,6 @@ EXTRA_DIST = \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
        dfilters                \
-       docbook/Makefile.auto.am        \
-       docbook/ws.css          \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
@@ -702,6 +701,8 @@ EXTRA_DIST = \
        image/stock_dialog_stop_48.xpm  \
        image/stock_dialog_warning_48.xpm       \
        image/text2pcap.rc.in   \
+       image/toolbar/analyze_24.xpm \
+       image/toolbar/audio_player_24.xpm       \
        image/toolbar/autoscroll_24.xpm \
        image/toolbar/capture_airpcap_16.xpm \
        image/toolbar/capture_capture_16.xpm \
@@ -718,6 +719,7 @@ EXTRA_DIST = \
        image/toolbar/checkbox_16.xpm   \
        image/toolbar/colorize_24.xpm   \
        image/toolbar/conversations_16.xpm      \
+       image/toolbar/decode_24.xpm     \
        image/toolbar/decode_as_16.xpm  \
        image/toolbar/display_filter_24.xpm     \
        image/toolbar/endpoints_16.xpm  \
@@ -741,23 +743,37 @@ EXTRA_DIST = \
        image/toolbar/modem_16.png      \
        image/toolbar/modem_16.xpm      \
        image/toolbar/network_bluetooth_16.png  \
+       image/toolbar/network_usb.svg           \
+       image/toolbar/network_usb_16.png        \
        image/toolbar/network_virtual_16.xpm    \
        image/toolbar/network_wired_16.png      \
        image/toolbar/network_wireless_16.png   \
        image/toolbar/resize_columns_24.xpm     \
+       image/toolbar/telephone_16.xpm  \
        image/toolbar/telephony_16.xpm  \
        image/toolbar/time_24.xpm       \
+       image/toolbar/voip_flow_24.xpm  \
        image/toolbar/web_support_24.xpm        \
        image/toolbar/wep_closed_24.xpm \
        image/toolbar/wiki_24.xpm       \
        image/tshark.rc.in      \
        image/up_arrow.xpm      \
-       image/wiresharkdoc.ico  \
+       image/voip_bg.xpm       \
+       image/voip_select.xpm   \
        image/wireshark.exe.manifest.in \
        image/wireshark.ico     \
-       image/wiresharkinst.ico \
        image/wireshark.rc.in   \
+       image/WiresharkDoc-128.png      \
+       image/WiresharkDoc-16.png       \
+       image/WiresharkDoc-24.png       \
+       image/WiresharkDoc-256.png      \
+       image/WiresharkDoc-32.png       \
+       image/WiresharkDoc-48.png       \
+       image/WiresharkDoc-64.png       \
+       image/wiresharkdoc.ico  \
+       image/wiresharkinst.ico \
        image/wiretap.rc.in     \
+       image/wsicon.svg        \
        image/wsicon16.png      \
        image/wsicon16.xpm      \
        image/wsicon256.png     \
@@ -767,20 +783,17 @@ EXTRA_DIST = \
        image/wsicon48.xpm      \
        image/wsicon64.png      \
        image/wsicon64.xpm      \
+       image/wsiconcap.svg     \
        image/wsiconcap16.xpm   \
        image/wsiconcap256.png  \
        image/wsiconcap32.xpm   \
        image/wsiconcap48.xpm   \
-       image/wsiconcap.svg     \
-       image/wsicondoc256.png  \
-       image/wsicondoc.svg     \
-       image/wsiconinst256.png \
        image/wsiconinst.svg    \
-       image/wsicon.svg        \
+       image/wsiconinst256.png \
        image/wslogo.eps        \
        image/wslogo.svg        \
-       image/wssplash.xpm      \
        image/wssplash-dev.xpm  \
+       image/wssplash.xpm      \
        ipmap.html      \
        make-manuf              \
        make-version.pl         \
@@ -809,7 +822,7 @@ else
 install-exec-hook:
 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
@@ -854,7 +867,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 .. ; \
@@ -868,7 +881,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 .. ; \
@@ -904,6 +917,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)