Add support for plugin dissectors on cygwin builds, by adding the following

line to every Makefile.am file for a given plugin XXX:

	XXX_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@

This way symbols defined in libethereal and GLib are resolved when linking
the plugin dissector modules.

svn path=/trunk/; revision=10601

18 files changed, 37 insertions, 18 deletions

diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
index f48ed45379..287ce9e414 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.2 2003/11/17 22:34:21 guy Exp $
+# $Id: Makefile.am,v 1.3 2004/04/14 22:13:22 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 833e30c463..1316d62eed 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.3 2003/11/17 22:34:22 guy Exp $
+# $Id: Makefile.am,v 1.4 2004/04/14 22:13:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 12c2ad2807..437cd697ff 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.4 2004/01/18 14:08:28 jmayer Exp $
+# $Id: Makefile.am,v 1.5 2004/04/14 22:13:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 f8049321e0..f5aebc6e5a 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.1 2004/03/25 11:21:06 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:23 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,6 +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@
 
 # 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 4a666e6e5f..7413082174 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.6 2004/03/17 06:55:02 guy Exp $
+# $Id: Makefile.am,v 1.7 2004/04/14 22:13:24 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 8399081852..77294975a1 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.1 2003/11/17 20:57:13 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:24 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 b99bdaaa0b..653d2b83f5 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.5 2003/11/17 22:31:27 guy Exp $
+# $Id: Makefile.am,v 1.6 2004/04/14 22:13:25 obiot Exp $
 #
 # Copyright 2001, Ericsson Inc.
 # Frank Singleton <frank.singleton@ericsson.com>
@@ -32,9 +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@
 
 coseventcomm_la_SOURCES = packet-coseventcomm.c moduleinfo.h
 coseventcomm_la_LDFLAGS = -module -avoid-version
+coseventcomm_la_LIBADD = -L../../epan -lethereal @GLIB_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 8fa05abfc9..7dba13e66e 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.12 2003/11/17 22:34:23 guy Exp $
+# $Id: Makefile.am,v 1.13 2004/04/14 22:13:25 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -31,6 +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@
 
 # 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 92ce16bfcb..5e8fdacd7a 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.1 2003/12/18 19:04:47 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:25 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 d6b1d96cf8..948ffb70f6 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.3 2003/09/05 07:44:47 jmayer Exp $
+# $Id: Makefile.am,v 1.4 2004/04/14 22:13:25 obiot Exp $
 #
 # Ethereal - Network traffic analyzer / light waight resolver (part of Bind9)
 # By Steve Oleg Terletsky <oleg.terletsky@comverse.com>
@@ -29,6 +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@
 
 # 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 21ed2d45ab..79b2107888 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.2 2003/09/05 07:44:48 jmayer Exp $
+# $Id: Makefile.am,v 1.3 2004/04/14 22:13:25 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 bd5adea090..a37fe22d36 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.8 2003/11/17 22:34:24 guy Exp $
+# $Id: Makefile.am,v 1.9 2004/04/14 22:13:26 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 5ecb15fdd4..58390665f3 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.3 2003/11/17 22:34:24 guy Exp $
+# $Id: Makefile.am,v 1.4 2004/04/14 22:13:26 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 ec9e06de0b..1570e703a8 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.1 2003/11/17 20:57:14 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:26 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 d396030698..5e2400b3f4 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.1 2004/03/25 11:21:07 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:26 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,6 +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@
 
 # 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 66fd96fdb6..4f2bff9699 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.3 2003/11/17 22:34:25 guy Exp $
+# $Id: Makefile.am,v 1.4 2004/04/14 22:13:27 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # 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 b681bf0eb5..e3b7d17fc3 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.1 2004/03/25 11:21:07 guy Exp $
+# $Id: Makefile.am,v 1.2 2004/04/14 22:13:28 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -30,6 +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@
 
 # 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 0ea00f5c48..3b5ae7cd71 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.2 2003/12/17 07:02:12 guy Exp $
+# $Id: Makefile.am,v 1.3 2004/04/14 22:13:28 obiot Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -29,6 +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@
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,