Add image/wiresharkdoc.ico to the EXTRA_DIST symbol

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

diff --git a/Makefile.am b/Makefile.am
index 3f789a9332c1c4c25310b5f4b230e9d9e6e797c6..0a33b6284d88db460dd87c14d498f03d332c1b64 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,6 +108,7 @@ dtds_DATA = \
        dtds/pocsettings.dtd \
        dtds/presence.dtd \
        dtds/reginfo.dtd \
+       dtds/rlmi.dtd \
        dtds/rss.dtd \
        dtds/smil.dtd \
        dtds/xcap-caps.dtd \
@@ -187,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 \
@@ -205,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 \
@@ -213,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 \
@@ -226,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 \
@@ -246,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 \
@@ -254,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 \
@@ -431,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
 
@@ -667,6 +652,7 @@ EXTRA_DIST = \
        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   \
@@ -674,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      \
@@ -683,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      \
@@ -707,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