use DISSECTOR_ASSERT instead of g_assert

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

diff --git a/Makefile.am b/Makefile.am
index d0c5d086b5597b3e4b5a512e8b483510305f6955..f1811fcb6a53d0bd18f3e87a6d9ec52343df1ef9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,7 @@ include Makefile.common
 if HAVE_PLUGINS
 plugin_libs = \
        plugins/acn/acn.la \
+       plugins/agentx/agentx.la \
        plugins/artnet/artnet.la \
        plugins/asn1/asn1.la \
        plugins/ciscosm/ciscosm.la \
@@ -114,8 +115,11 @@ plugin_libs = \
        plugins/v5ua/v5ua.la
 
 if ENABLE_STATIC
-plugin_ldadd = \
+plugin_ldadd = $(plugin_libs)
+
+dummyddd = \
        plugins/acn/packet-acn.o \
+       plugins/agentx/packet-agentx.o \
        plugins/artnet/packet-artnet.o \
        plugins/asn1/packet-asn1.o \
        plugins/ciscosm/packet-sm.o \
@@ -164,6 +168,7 @@ else                # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
        "-dlopen" plugins/acn/acn.la \
+       "-dlopen" plugins/agentx/agentx.la \
        "-dlopen" plugins/artnet/artnet.la \
        "-dlopen" plugins/asn1/asn1.la \
        "-dlopen" plugins/ciscosm/ciscosm.la \
@@ -303,7 +308,7 @@ svnversion.h: FORCE
 # Build the short version of the authors file for the about dialog
 #
 AUTHORS-SHORT: AUTHORS make-authors-short.pl
-       $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+       $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(srcdir)/AUTHORS > AUTHORS-SHORT
 
 #
 # Build the short version of the authors file with formatting codes for the
@@ -378,21 +383,31 @@ dftest_LDADD = \
 
 dftest_LDFLAGS = -export-dynamic
 
-CLEANFILES =   \
-       svnversion.h \
-       @rdps_bin@ \
-       idl2eth
+#
+# XXX - "svnversion.h" is distributed in the release tarball; should
+# we be deleting it with "make clean", or should we only do that with
+# "make maintainer-clean"?
+#
+CLEANFILES =           \
+       svnversion.h    \
+       @rdps_bin@      \
+       idl2eth         \
+       *~
 
+#
+# XXX - "ps.c" is distributed in the source tarballs; why is it in the
+# list of files removed by "make distclean"?  (It's deliberately
+# included in that list.)
+#
 DISTCLEANFILES = \
-       ps.c \
-       *~
+       AUTHORS-SHORT           \
+       AUTHORS-SHORT-FORMAT    \
+       ps.c
 
 MAINTAINERCLEANFILES =         \
-       ps.c
+       $(GENERATED_FILES)
 
 EXTRA_DIST = \
-       AUTHORS-SHORT           \
-       AUTHORS-SHORT-FORMAT    \
        FAQ                     \
        INSTALL.configure       \
        Makefile.common         \
@@ -406,7 +421,6 @@ EXTRA_DIST = \
        README.tru64            \
        README.vmware           \
        README.win32            \
-       TODO                    \
        aclocal-fallback/glib-2.0.m4 \
        aclocal-fallback/glib.m4 \
        aclocal-fallback/gtk-2.0.m4 \
@@ -452,6 +466,7 @@ EXTRA_DIST = \
        doc/randpkt.txt         \
        doc/tethereal.pod       \
        doc/text2pcap.pod       \
+       docbook/Makefile.auto.am        \
        doxygen.cfg.in          \
        editcap.c               \
        epan/libethereal.def    \