Replace the plugin linkage libs into PLUGIN_LIBS which is generated from the

top-level configure.in when running configure.

svn path=/trunk/; revision=10699

20 files changed, 48 insertions, 41 deletions

diff --git a/configure.in b/configure.in
index ac9aa29d7f..21362b3ecc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.256 2004/04/22 20:02:58 obiot Exp $
+# $Id: configure.in,v 1.257 2004/04/25 21:07:15 obiot Exp $
 #
 AC_INIT(etypes.h)
 
@@ -967,6 +967,12 @@ else
 fi
 AC_SUBST(plugindir)
 
+#
+# The plugin dissectors reside in ./plugins/PROTO/
+#
+PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
+AC_SUBST(PLUGIN_LIBS)
+
 dnl libtool defs
 #
 # Yes, AM_PROG_LIBTOOL is redundant with newer version(s) of some tool(s)
diff --git a/doc/README.plugins b/doc/README.plugins
index 1dbb6e1d28..21980e2649 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -1,4 +1,4 @@
-$Id: README.plugins,v 1.11 2004/04/14 22:13:21 obiot Exp $
+$Id: README.plugins,v 1.12 2004/04/25 21:10:20 obiot Exp $
 
 Plugins
 
@@ -113,7 +113,8 @@ toplevel Makefile.nmake, and toplevel configure.in files.
 
 3.4.1 plugins/xxx/Makefile.am
 
-An example of the Makefile.am follows:
+An example of the Makefile.am follows (note that the @foo@ constructs will be
+replaced with their actual values when running configure):
 
 INCLUDES = -I$(top_srcdir)
 
@@ -122,7 +123,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = xxx.la
 xxx_la_SOURCES = packet-xxx.c moduleinfo.h
 xxx_la_LDFLAGS = -module -avoid-version
-xxx_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+xxx_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
index 287ce9e414..d33e0e625e 100644
--- a/plugins/acn/Makefile.am
+++ b/plugins/acn/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/ACN
 #
-# $Id: Makefile.am,v 1.3 2004/04/14 22:13:22 obiot Exp $
+# $Id: Makefile.am,v 1.4 2004/04/25 21:07:15 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = acn.la
 acn_la_SOURCES = packet-acn.c moduleinfo.h acn.h
 acn_la_LDFLAGS = -module -avoid-version
-acn_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+acn_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index 1316d62eed..788d32c55b 100644
--- a/plugins/artnet/Makefile.am
+++ b/plugins/artnet/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/ArtNET
 #
-# $Id: Makefile.am,v 1.4 2004/04/14 22:13:23 obiot Exp $
+# $Id: Makefile.am,v 1.5 2004/04/25 21:07:16 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = artnet.la
 artnet_la_SOURCES = packet-artnet.c moduleinfo.h
 artnet_la_LDFLAGS = -module -avoid-version
-artnet_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+artnet_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index 437cd697ff..a29e7eae05 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/asn1
 #
-# $Id: Makefile.am,v 1.5 2004/04/14 22:13:23 obiot Exp $
+# $Id: Makefile.am,v 1.6 2004/04/25 21:07:16 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = asn1.la
 asn1_la_SOURCES = packet-asn1.c moduleinfo.h
 asn1_la_LDFLAGS = -module -avoid-version
-asn1_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+asn1_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/ciscosm/Makefile.am b/plugins/ciscosm/Makefile.am
index f5aebc6e5a..2f26a6325d 100644
--- a/plugins/ciscosm/Makefile.am
+++ b/plugins/ciscosm/Makefile.am
@@ -2,7 +2,7 @@
 # Automake file for Cisco SS7 Session Management dissector
 # Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:23 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:16 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = ciscosm.la
 ciscosm_la_SOURCES = packet-sm.c moduleinfo.h
 ciscosm_la_LDFLAGS = -module -avoid-version
-ciscosm_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+ciscosm_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 7413082174..6a2c681b72 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/docsis subdissectors
 #
-# $Id: Makefile.am,v 1.7 2004/04/14 22:13:24 obiot Exp $
+# $Id: Makefile.am,v 1.8 2004/04/25 21:07:17 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = docsis.la
 docsis_la_SOURCES = packet-intrngreq.c packet-type29ucd.c packet-docsis.c packet-bpkmattr.c packet-dsarsp.c packet-macmgmt.c packet-rngrsp.c packet-bpkmreq.c packet-dscack.c packet-map.c packet-tlv.c packet-bpkmrsp.c packet-dscreq.c packet-regack.c packet-uccreq.c packet-dscrsp.c packet-regreq.c packet-uccrsp.c packet-dsaack.c packet-dsdreq.c packet-regrsp.c packet-ucd.c packet-dsareq.c packet-dsdrsp.c packet-rngreq.c packet-vendor.c packet-docsis.h packet-tlv.h moduleinfo.h
 docsis_la_LDFLAGS = -module -avoid-version
-docsis_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+docsis_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/enttec/Makefile.am b/plugins/enttec/Makefile.am
index 77294975a1..8a267d201c 100644
--- a/plugins/enttec/Makefile.am
+++ b/plugins/enttec/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/ENTTEC
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:24 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:17 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = enttec.la
 enttec_la_SOURCES = packet-enttec.c moduleinfo.h
 enttec_la_LDFLAGS = -module -avoid-version
-enttec_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+enttec_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index 653d2b83f5..e6dff8df38 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/GIOP subdissectors 
 #
-# $Id: Makefile.am,v 1.6 2004/04/14 22:13:25 obiot Exp $
+# $Id: Makefile.am,v 1.7 2004/04/25 21:07:18 obiot Exp $
 #
 # Copyright 2001, Ericsson Inc.
 # Frank Singleton <frank.singleton@ericsson.com>
@@ -32,11 +32,11 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = cosnaming.la coseventcomm.la
 cosnaming_la_SOURCES = packet-cosnaming.c moduleinfo.h
 cosnaming_la_LDFLAGS = -module -avoid-version
-cosnaming_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+cosnaming_la_LIBADD = @PLUGIN_LIBS@
 
 coseventcomm_la_SOURCES = packet-coseventcomm.c moduleinfo.h
 coseventcomm_la_LDFLAGS = -module -avoid-version
-coseventcomm_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+coseventcomm_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index 7dba13e66e..9aa62bbdce 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -3,7 +3,7 @@
 # By Steve Limkemann <stevelim@dgtech.com>
 # Copyright 1998 Steve Limkemann
 #
-# $Id: Makefile.am,v 1.13 2004/04/14 22:13:25 obiot Exp $
+# $Id: Makefile.am,v 1.14 2004/04/25 21:07:19 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -31,7 +31,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = gryphon.la
 gryphon_la_SOURCES = packet-gryphon.c packet-gryphon.h moduleinfo.h
 gryphon_la_LDFLAGS = -module -avoid-version
-gryphon_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+gryphon_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 5e8fdacd7a..80c7bad149 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/IrDA
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:25 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:21 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = irda.la
 irda_la_SOURCES = packet-irda.c moduleinfo.h irda-appl.h packet-ircomm.c
 irda_la_LDFLAGS = -module -avoid-version
-irda_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+irda_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index 948ffb70f6..f7a7c3651b 100644
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/lwres
 #
-# $Id: Makefile.am,v 1.4 2004/04/14 22:13:25 obiot Exp $
+# $Id: Makefile.am,v 1.5 2004/04/25 21:07:22 obiot Exp $
 #
 # Ethereal - Network traffic analyzer / light waight resolver (part of Bind9)
 # By Steve Oleg Terletsky <oleg.terletsky@comverse.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = lwres.la
 lwres_la_SOURCES = packet-lwres.c moduleinfo.h
 lwres_la_LDFLAGS = -module -avoid-version
-lwres_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+lwres_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am
index 79b2107888..cdf77eff4a 100644
--- a/plugins/megaco/Makefile.am
+++ b/plugins/megaco/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Megaco Ethereal plugin
 #
-# $Id: Makefile.am,v 1.3 2004/04/14 22:13:25 obiot Exp $
+# $Id: Makefile.am,v 1.4 2004/04/25 21:07:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = megaco.la
 megaco_la_SOURCES = packet-megaco.c moduleinfo.h
 megaco_la_LDFLAGS = -module -avoid-version
-megaco_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+megaco_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am
index a37fe22d36..b53ff61ecb 100644
--- a/plugins/mgcp/Makefile.am
+++ b/plugins/mgcp/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/MGCP
 #
-# $Id: Makefile.am,v 1.9 2004/04/14 22:13:26 obiot Exp $
+# $Id: Makefile.am,v 1.10 2004/04/25 21:07:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = mgcp.la
 mgcp_la_SOURCES = packet-mgcp.c packet-mgcp.h moduleinfo.h
 mgcp_la_LDFLAGS = -module -avoid-version
-mgcp_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+mgcp_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am
index 58390665f3..5d7b300634 100644
--- a/plugins/pcli/Makefile.am
+++ b/plugins/pcli/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/Gryphon
 #
-# $Id: Makefile.am,v 1.4 2004/04/14 22:13:26 obiot Exp $
+# $Id: Makefile.am,v 1.5 2004/04/25 21:07:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = pcli.la
 pcli_la_SOURCES = packet-pcli.c moduleinfo.h
 pcli_la_LDFLAGS = -module -avoid-version
-pcli_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+pcli_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/rdm/Makefile.am b/plugins/rdm/Makefile.am
index 1570e703a8..a8f298782e 100644
--- a/plugins/rdm/Makefile.am
+++ b/plugins/rdm/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/RDM
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:26 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = rdm.la
 rdm_la_SOURCES = packet-rdm.c moduleinfo.h
 rdm_la_LDFLAGS = -module -avoid-version
-rdm_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+rdm_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/rlm/Makefile.am b/plugins/rlm/Makefile.am
index 5e2400b3f4..8ac56aae3d 100644
--- a/plugins/rlm/Makefile.am
+++ b/plugins/rlm/Makefile.am
@@ -2,7 +2,7 @@
 # Automake file for Cisco SS7 Redundant Link Management dissector
 # Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:26 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = rlm.la
 rlm_la_SOURCES = packet-rlm.c moduleinfo.h
 rlm_la_LDFLAGS = -module -avoid-version
-rlm_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+rlm_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am
index 4f2bff9699..2564080005 100644
--- a/plugins/rtnet/Makefile.am
+++ b/plugins/rtnet/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/RTNET
 #
-# $Id: Makefile.am,v 1.4 2004/04/14 22:13:27 obiot Exp $
+# $Id: Makefile.am,v 1.5 2004/04/25 21:07:24 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = rtnet.la
 rtnet_la_SOURCES = packet-rtnet.c moduleinfo.h
 rtnet_la_LDFLAGS = -module -avoid-version
-rtnet_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+rtnet_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/rudp/Makefile.am b/plugins/rudp/Makefile.am
index e3b7d17fc3..d62af1a067 100644
--- a/plugins/rudp/Makefile.am
+++ b/plugins/rudp/Makefile.am
@@ -2,7 +2,7 @@
 # Automake file for Cisco SS7 Reliable UDP dissector
 # Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
 #
-# $Id: Makefile.am,v 1.2 2004/04/14 22:13:28 obiot Exp $
+# $Id: Makefile.am,v 1.3 2004/04/25 21:07:24 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,7 +30,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = rudp.la
 rudp_la_SOURCES = packet-rudp.c moduleinfo.h
 rudp_la_LDFLAGS = -module -avoid-version
-rudp_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+rudp_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am
index 3b5ae7cd71..cbcb11e38f 100644
--- a/plugins/v5ua/Makefile.am
+++ b/plugins/v5ua/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for V5UA plugin
 #
-# $Id: Makefile.am,v 1.3 2004/04/14 22:13:28 obiot Exp $
+# $Id: Makefile.am,v 1.4 2004/04/25 21:07:25 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@ plugindir = @plugindir@
 plugin_LTLIBRARIES = v5ua.la
 v5ua_la_SOURCES = packet-v5ua.c moduleinfo.h
 v5ua_la_LDFLAGS = -module -avoid-version
-v5ua_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@
+v5ua_la_LIBADD = @PLUGIN_LIBS@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,