Add image/wiresharkdoc.ico to the EXTRA_DIST symbol
[obnox/wireshark/wip.git] / Makefile.am
index f1c8a901cb8ff98e9c1e9b8b72b51cd52aa22ba1..0a33b6284d88db460dd87c14d498f03d332c1b64 100644 (file)
@@ -77,7 +77,7 @@ idl2wrs: tools/idl2wrs.sh Makefile
 #
 # Wireshark configuration files are put in $(pkgdatadir).
 #
-pkgdata_DATA = AUTHORS-SHORT manuf wireshark.html tshark.html \
+pkgdata_DATA = AUTHORS-SHORT COPYING manuf wireshark.html tshark.html \
        wireshark-filter.html capinfos.html editcap.html \
        idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
        cfilters colorfilters dfilters
@@ -108,8 +108,10 @@ dtds_DATA = \
        dtds/pocsettings.dtd \
        dtds/presence.dtd \
        dtds/reginfo.dtd \
+       dtds/rlmi.dtd \
        dtds/rss.dtd \
        dtds/smil.dtd \
+       dtds/xcap-caps.dtd \
        dtds/watcherinfo.dtd
 #
 # Install the RADIUS directory files in the "radius" subdirectory
@@ -186,12 +188,6 @@ include Makefile.common
 
 if HAVE_PLUGINS
 
-if HAVE_LIBLUA
-lua_lib = plugins/lua/lua.la
-else           # HAVE_LIBLUA
-lua_lib =
-endif          # HAVE_LIBLUA
-
 plugin_libs = \
        plugins/acn/acn.la \
        plugins/agentx/agentx.la \
@@ -204,7 +200,6 @@ plugin_libs = \
        plugins/giop/coseventcomm.la \
        plugins/gryphon/gryphon.la \
        plugins/irda/irda.la \
-       $(lua_lib) \
        plugins/lwres/lwres.la \
        plugins/mate/mate.la \
        plugins/megaco/megaco.la \
@@ -212,7 +207,6 @@ plugin_libs = \
        plugins/opsi/opsi.la \
        plugins/pcli/pcli.la \
        plugins/profinet/profinet.la \
-       plugins/rdm/rdm.la \
        plugins/rlm/rlm.la \
        plugins/rtnet/rtnet.la \
        plugins/rudp/rudp.la \
@@ -225,12 +219,6 @@ plugin_ldadd = $(plugin_libs)
 
 else           # ENABLE_STATIC
 
-if HAVE_LIBLUA
-lua_ldadd = "-dlopen" plugins/lua/lua.la
-else           # HAVE_LIBLUA
-lua_ldadd =
-endif          # HAVE_LIBLUA
-
 plugin_ldadd = \
        "-dlopen" self  \
        "-dlopen" plugins/acn/acn.la \
@@ -245,7 +233,6 @@ plugin_ldadd = \
        "-dlopen" plugins/gryphon/gryphon.la \
        "-dlopen" plugins/h223/h223.la \
        "-dlopen" plugins/irda/irda.la \
-       $(lua_ldadd) \
        "-dlopen" plugins/lwres/lwres.la \
        "-dlopen" plugins/mate/mate.la \
        "-dlopen" plugins/megaco/megaco.la \
@@ -253,7 +240,6 @@ plugin_ldadd = \
        "-dlopen" plugins/opsi/opsi.la \
        "-dlopen" plugins/pcli/pcli.la \
        "-dlopen" plugins/profinet/profinet.la \
-       "-dlopen" plugins/rdm/rdm.la \
        "-dlopen" plugins/rlm/rlm.la \
        "-dlopen" plugins/rtnet/rtnet.la \
        "-dlopen" plugins/rudp/rudp.la \
@@ -277,13 +263,14 @@ endif             # HAVE_PLUGINS
 # we should probably split this into stuff needed both
 # by wireshark and tshark and stuff needed only by one or the
 # other.
-wireshark_optional_objects = @GETOPT_O@ @SNPRINTF_O@ @STRERROR_O@ \
+wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
        @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
 
 # Additional libs that I know how to build. These will be
 # linked into the wireshark executable.
 wireshark_additional_libs = \
        gtk/libui.a             \
+       codecs/libcodec.a       \
        wiretap/libwiretap.la   \
        epan/libwireshark.la
 
@@ -314,7 +301,10 @@ wireshark_LDADD = \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
-       @LIBGNUTLS_LIBS@
+       @LIBICONV@                      \
+       @LIBGCRYPT_LIBS@                \
+       @LIBGNUTLS_LIBS@                \
+       @PORTAUDIO_LIBS@
 
 # Additional libs that I know how to build. These will be
 # linked into the tshark executable.
@@ -337,6 +327,8 @@ tshark_LDADD = \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+       @LIBICONV@                      \
+       @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@
 
 if ENABLE_STATIC
@@ -424,7 +416,7 @@ ps.c: print.ps rdps
        ./rdps $(srcdir)/print.ps ps.c
 
 rdps: rdps.c
-       $(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c
+       $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o rdps $(srcdir)/rdps.c
 
 randpkt_additional_libs = wiretap/libwiretap.la
 
@@ -454,6 +446,8 @@ dftest_LDADD = \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
        @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+       @LIBICONV@                      \
+       @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@
 
 dftest_LDFLAGS = -export-dynamic
@@ -520,6 +514,7 @@ EXTRA_DIST = \
        aclocal-fallback/glib.m4 \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-fallback/gtk.m4 \
+       aclocal-fallback/iconv.m4 \
        aclocal-flags           \
        autogen.sh              \
        capinfos.c              \
@@ -602,9 +597,15 @@ EXTRA_DIST = \
        image/stock_dialog_warning_48.xpm       \
        image/text2pcap.rc.in   \
        image/toolbar/autoscroll_24.xpm \
+       image/toolbar/capture_airpcap_16.xpm \
+       image/toolbar/capture_capture_16.xpm \
+       image/toolbar/capture_details_16.xpm \
+       image/toolbar/capture_details_24.xpm \
+       image/toolbar/capture_ethernet_16.xpm  \
        image/toolbar/capture_filter_24.xpm     \
        image/toolbar/capture_interfaces_24.xpm \
        image/toolbar/capture_options_24.xpm    \
+       image/toolbar/capture_prepare_16.xpm \
        image/toolbar/capture_restart_24.xpm    \
        image/toolbar/capture_start_24.xpm      \
        image/toolbar/capture_stop_24.xpm       \
@@ -646,10 +647,12 @@ EXTRA_DIST = \
        image/toolbar/telephony_16.xpm  \
        image/toolbar/time_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/win32-file-dlg.rc \
+       image/wiresharkdoc.ico  \
        image/wireshark.exe.manifest.in \
        image/wireshark.ico     \
        image/wireshark.rc.in   \
@@ -657,7 +660,7 @@ EXTRA_DIST = \
        image/wsicon.svg        \
        image/wsicon16.png      \
        image/wsicon16.xpm      \
-       image/wsicon200.png     \
+       image/wsicon256.png     \
        image/wsicon32.png      \
        image/wsicon32.xpm      \
        image/wsicon48.png      \
@@ -666,9 +669,11 @@ EXTRA_DIST = \
        image/wsicon64.xpm      \
        image/wsiconcap.svg     \
        image/wsiconcap16.xpm   \
-       image/wsiconcap200.png  \
+       image/wsiconcap256.png  \
        image/wsiconcap32.xpm   \
        image/wsiconcap48.xpm   \
+       image/wsicondoc.svg     \
+       image/wsicondoc256.png  \
        image/wslogo.eps        \
        image/wslogo.svg        \
        image/wssplash.xpm      \
@@ -690,6 +695,11 @@ EXTRA_DIST = \
        text2pcap-scanner.l     \
        text2pcap.c             \
        text2pcap.h             \
+       packaging/u3/win32/README.txt           \
+       packaging/u3/win32/makefile.nmake       \
+       packaging/u3/win32/manifest.tmpl        \
+       packaging/u3/win32/u3util.c             \
+       tools/idl2wrs.sh.in                     \
        wka.tmpl
 
 if SETUID_INSTALL
@@ -700,7 +710,7 @@ else
 install-exec-hook:
 endif
 
-DIST_SUBDIRS = asn1 doc epan gtk help packaging plugins tools wiretap
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap
 
 if HAVE_PLUGINS
 SUBDIRS = tools wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
@@ -827,7 +837,7 @@ srpm-package: dist
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
                ln -s ../../../wireshark.desktop ; \
-               ln -s ../../../image/elogo3d64x64.png wireshark.png ; \
+               ln -s ../../../image/wsicon64.png wireshark.png ; \
                cd .. ; \
                rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/wireshark.spec && \
                        echo "Package successfully built in `pwd`/SRPMS." ; \