diff options
author | Jörg Mayer <jmayer@loplof.de> | 2003-09-05 07:44:50 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2003-09-05 07:44:50 +0000 |
commit | 10b364c56dea8b351fd7150b17ec5786f441cff6 (patch) | |
tree | 83c4bb27a5beba5fee61ceab8bf6cb07cfcfaba4 /plugins | |
parent | dd2080a64633a1fd43644061c0a5dacc336a437e (diff) |
- Make --enable-static work again (configure.in, Makefile.am)
- get rid of ...-static.o files in the build process (now done via
config.h instead of compiler flag)
- make packet-rtnet link statically (remove one unused function, rename
another one)
svn path=/trunk/; revision=8389
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/artnet/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/artnet/packet-artnet.c | 6 | ||||
-rw-r--r-- | plugins/docsis/Makefile.am | 77 | ||||
-rw-r--r-- | plugins/docsis/packet-docsis.c | 6 | ||||
-rw-r--r-- | plugins/giop/Makefile.am | 12 | ||||
-rw-r--r-- | plugins/giop/packet-coseventcomm.c | 4 | ||||
-rw-r--r-- | plugins/giop/packet-cosnaming.c | 4 | ||||
-rw-r--r-- | plugins/gryphon/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/gryphon/packet-gryphon.c | 4 | ||||
-rw-r--r-- | plugins/lwres/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/lwres/packet-lwres.c | 50 | ||||
-rw-r--r-- | plugins/megaco/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/megaco/packet-megaco.c | 6 | ||||
-rw-r--r-- | plugins/mgcp/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/mgcp/packet-mgcp.c | 6 | ||||
-rw-r--r-- | plugins/pcli/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/pcli/packet-pcli.c | 6 | ||||
-rw-r--r-- | plugins/rtnet/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/rtnet/packet-rtnet.c | 6 |
19 files changed, 41 insertions, 195 deletions
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am index f75e9dd70f..be5371857f 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.1 2003/04/21 21:28:39 guy Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:44 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ artnet_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -artnet_la_DEPENDENCIES = packet-artnet-static.o - -packet-artnet-static.o: packet-artnet.c moduleinfo.h - $(LTCOMPILE) -c -o packet-artnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-artnet.c - CLEANFILES = \ artnet \ *~ diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c index a5ec14c20e..5b176a5e55 100644 --- a/plugins/artnet/packet-artnet.c +++ b/plugins/artnet/packet-artnet.c @@ -1,7 +1,7 @@ /* packet-artnet.c * Routines for Art-Net packet disassembly * - * $Id: packet-artnet.c,v 1.3 2003/08/24 01:44:00 sahlberg Exp $ + * $Id: packet-artnet.c,v 1.4 2003/09/05 07:44:45 jmayer Exp $ * * Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com> * @@ -49,7 +49,7 @@ /* Define version if we are not building ethereal statically */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -2591,7 +2591,7 @@ proto_reg_handoff_artnet(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index b101f3672b..3296a842d1 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.4 2003/01/11 09:15:00 guy Exp $ +# $Id: Makefile.am,v 1.5 2003/09/05 07:44:45 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -35,81 +35,6 @@ docsis_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -docsis_la_DEPENDENCIES = packet-docsis-static.o packet-bpkmattr-static.o packet-dsarsp-static.o packet-macmgmt-static.o packet-rngrsp-static.o packet-bpkmreq-static.o packet-dscack-static.o packet-map-static.o packet-tlv-static.o packet-bpkmrsp-static.o packet-dscreq-static.o packet-regack-static.o packet-uccreq-static.o packet-dscrsp-static.o packet-regreq-static.o packet-uccrsp-static.o packet-dsaack-static.o packet-dsdreq-static.o packet-regrsp-static.o packet-ucd-static.o packet-dsareq-static.o packet-dsdrsp-static.o packet-rngreq-static.o packet-vendor-static.o - -packet-docsis-static.o: packet-docsis.c moduleinfo.h - $(LTCOMPILE) -c -o packet-docsis-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-docsis.c - - -packet-bpkmattr-static.o: packet-bpkmattr.c moduleinfo.h - $(LTCOMPILE) -c -o packet-bpkmattr-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmattr.c - -packet-dsarsp-static.o: packet-dsarsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dsarsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsarsp.c - -packet-macmgmt-static.o: packet-macmgmt.c moduleinfo.h - $(LTCOMPILE) -c -o packet-macmgmt-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-macmgmt.c - -packet-rngrsp-static.o: packet-rngrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-rngrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngrsp.c - -packet-bpkmreq-static.o: packet-bpkmreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-bpkmreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmreq.c - -packet-dscack-static.o: packet-dscack.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dscack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscack.c - -packet-map-static.o: packet-map.c moduleinfo.h - $(LTCOMPILE) -c -o packet-map-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-map.c - -packet-tlv-static.o: packet-tlv.c packet-tlv.h moduleinfo.h - $(LTCOMPILE) -c -o packet-tlv-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-tlv.c - -packet-bpkmrsp-static.o: packet-bpkmrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-bpkmrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-bpkmrsp.c - -packet-dscreq-static.o: packet-dscreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dscreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscreq.c - -packet-regack-static.o: packet-regack.c moduleinfo.h - $(LTCOMPILE) -c -o packet-regack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regack.c - -packet-uccreq-static.o: packet-uccreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-uccreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccreq.c - -packet-dscrsp-static.o: packet-dscrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dscrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dscrsp.c - -packet-regreq-static.o: packet-regreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-regreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regreq.c - -packet-uccrsp-static.o: packet-uccrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-uccrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-uccrsp.c - -packet-dsaack-static.o: packet-dsaack.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dsaack-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsaack.c - -packet-dsdreq-static.o: packet-dsdreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dsdreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdreq.c - -packet-regrsp-static.o: packet-regrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-regrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-regrsp.c - -packet-ucd-static.o: packet-ucd.c moduleinfo.h - $(LTCOMPILE) -c -o packet-ucd-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-ucd.c - -packet-dsareq-static.o: packet-dsareq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dsareq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsareq.c - -packet-dsdrsp-static.o: packet-dsdrsp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-dsdrsp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-dsdrsp.c - -packet-rngreq-static.o: packet-rngreq.c moduleinfo.h - $(LTCOMPILE) -c -o packet-rngreq-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rngreq.c - -packet-vendor-static.o: packet-vendor.c moduleinfo.h - $(LTCOMPILE) -c -o packet-vendor-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-vendor.c - CLEANFILES = \ docsis \ *~ diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index cde94de4be..b408392cb3 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -2,7 +2,7 @@ * Routines for docsis dissection * Copyright 2002, Anand V. Narwani <anand[AT]narwani.org> * - * $Id: packet-docsis.c,v 1.12 2003/05/28 14:52:51 gerald Exp $ + * $Id: packet-docsis.c,v 1.13 2003/09/05 07:44:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,7 +55,7 @@ #include <epan/packet.h> -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -771,7 +771,7 @@ proto_reg_handoff_docsis (void) /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff (void) diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am index d6475a9cda..b10949959e 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.3 2002/07/06 20:40:46 guy Exp $ +# $Id: Makefile.am,v 1.4 2003/09/05 07:44:45 jmayer Exp $ # # Copyright 2001, Ericsson Inc. # Frank Singleton <frank.singleton@ericsson.com> @@ -42,16 +42,6 @@ coseventcomm_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -cosnaming_la_DEPENDENCIES = packet-cosnaming-static.o -coseventcomm_la_DEPENDENCIES = packet-coseventcomm-static.o - -packet-cosnaming-static.o: packet-cosnaming.c moduleinfo.h - $(LTCOMPILE) -c -o packet-cosnaming-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-cosnaming.c - -packet-coseventcomm-static.o: packet-coseventcomm.c moduleinfo.h - $(LTCOMPILE) -c -o packet-coseventcomm-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-coseventcomm.c - - CLEANFILES = \ cosnaming \ coseventcomm \ diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 161f8672dd..fc41bfab5e 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -49,7 +49,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -860,7 +860,7 @@ void proto_register_handoff_giop_coseventcomm(void) { -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 1774ac6036..b8e90e935f 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -49,7 +49,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -1738,7 +1738,7 @@ void proto_register_handoff_giop_cosnaming(void) { -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 889f2bd921..f210784cd9 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal/Gryphon # -# $Id: Makefile.am,v 1.10 2002/07/06 20:40:47 guy Exp $ +# $Id: Makefile.am,v 1.11 2003/09/05 07:44:46 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ gryphon_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -gryphon_la_DEPENDENCIES = packet-gryphon-static.o - -packet-gryphon-static.o: packet-gryphon.c moduleinfo.h - $(LTCOMPILE) -c -o packet-gryphon-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-gryphon.c - CLEANFILES = \ gryphon \ *~ diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 13bae87b1e..c9c977010f 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -3,7 +3,7 @@ * By Steve Limkemann <stevelim@dgtech.com> * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.c,v 1.37 2003/06/12 08:33:32 guy Exp $ + * $Id: packet-gryphon.c,v 1.38 2003/09/05 07:44:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,7 +44,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am index b961e78cd7..d6b1d96cf8 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.2 2003/08/06 03:04:24 gerald Exp $ +# $Id: Makefile.am,v 1.3 2003/09/05 07:44:47 jmayer Exp $ # # Ethereal - Network traffic analyzer / light waight resolver (part of Bind9) # By Steve Oleg Terletsky <oleg.terletsky@comverse.com> @@ -35,11 +35,6 @@ lwres_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -lwres_la_DEPENDENCIES = packet-lwres-static.o - -packet-lwres-static.o: packet-lwres.c moduleinfo.h - $(LTCOMPILE) -c -o packet-lwres-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-lwres.c - CLEANFILES = \ lwres \ *~ diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c index 926614f266..e5ff0b2492 100644 --- a/plugins/lwres/packet-lwres.c +++ b/plugins/lwres/packet-lwres.c @@ -1,7 +1,7 @@ /* packet-lwres.c * Routines for light weight reslover (lwres, part of BIND9) packet disassembly * - * $Id: packet-lwres.c,v 1.2 2003/08/05 17:12:07 guy Exp $ + * $Id: packet-lwres.c,v 1.3 2003/09/05 07:44:47 jmayer Exp $ * * Copyright (c) 2003 by Oleg Terletsky <oleg.terletsky@comverse.com> * @@ -184,7 +184,7 @@ static int ett_ns_rec_item = -1; -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -211,42 +211,8 @@ static const value_string message_types_values[] = { -void -ip_to_str_buf(const guint8 *ad, gchar *buf) -{ - gchar *p; - int i; - guint32 octet; - guint32 digit; - gboolean saw_nonzero; - - p = buf; - i = 0; - for (;;) { - saw_nonzero = FALSE; - octet = ad[i]; - digit = octet/100; - if (digit != 0) { - *p++ = digit + '0'; - saw_nonzero = TRUE; - } - octet %= 100; - digit = octet/10; - if (saw_nonzero || digit != 0) - *p++ = digit + '0'; - digit = octet%10; - *p++ = digit + '0'; - if (i == 3) - break; - *p++ = '.'; - i++; - } - *p = '\0'; -} - - -int -get_dns_name(tvbuff_t *tvb, int offset, int dns_data_offset, +static int +lwres_get_dns_name(tvbuff_t *tvb, int offset, int dns_data_offset, char *name, int maxname) { int start_offset = offset; @@ -827,7 +793,7 @@ static void dissect_srv_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int namelen = len - 8; cmpname = tvb_get_ptr(tvb, curr + 8, namelen); - dlen = get_dns_name(tvb, curr + 8, curr, dname, sizeof(dname)); + dlen = lwres_get_dns_name(tvb, curr + 8, curr, dname, sizeof(dname)); if(srv_rec_tree) { @@ -903,7 +869,7 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in priority = tvb_get_ntohs(tvb, curr + 2); namelen = len - 4; cname = tvb_get_ptr(tvb, curr + 4, 4); - dlen = get_dns_name(tvb, curr + 4, curr, dname, sizeof(dname)); + dlen = lwres_get_dns_name(tvb, curr + 4, curr, dname, sizeof(dname)); if(mx_rec_tree) { rec_item = proto_tree_add_text(mx_rec_tree, tvb, curr,6,"MX record: pri=%d,dname=%s", @@ -956,7 +922,7 @@ static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in { len = tvb_get_ntohs(tvb, curr); namelen = len - 2; - dlen = get_dns_name(tvb, curr + 2, curr, dname, sizeof(dname)); + dlen = lwres_get_dns_name(tvb, curr + 2, curr, dname, sizeof(dname)); if(ns_rec_tree) { rec_item = proto_tree_add_text(ns_rec_tree, tvb, curr,4, "NS record: dname=%s",dname); @@ -1553,7 +1519,7 @@ proto_reg_handoff_lwres(void) /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am index d7465c8bed..21ed2d45ab 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.1 2003/01/14 23:53:40 guy Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:48 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -35,11 +35,6 @@ megaco_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -megaco_la_DEPENDENCIES = packet-megaco-static.o - -packet-megaco-static.o: packet-megaco.c moduleinfo.h - $(LTCOMPILE) -c -o packet-megaco-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-megaco.c - CLEANFILES = \ megaco \ *~ diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index 01d7e0c299..99ebed59fb 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -2,7 +2,7 @@ * Routines for megaco packet disassembly * RFC 3015 * -* $Id: packet-megaco.c,v 1.11 2003/09/03 06:48:45 guy Exp $ +* $Id: packet-megaco.c,v 1.12 2003/09/05 07:44:48 jmayer Exp $ * * Christian Falckenberg, 2002/10/17 * Copyright (c) 2002 by Christian Falckenberg @@ -52,7 +52,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -2652,7 +2652,7 @@ static gint tvb_skip_wsp_return(tvbuff_t* tvb, gint offset){ /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am index ee47098c76..3683b24ec2 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.6 2003/03/07 04:13:26 gerald Exp $ +# $Id: Makefile.am,v 1.7 2003/09/05 07:44:49 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ mgcp_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -mgcp_la_DEPENDENCIES = packet-mgcp-static.o - -packet-mgcp-static.o: packet-mgcp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-mgcp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-mgcp.c - CLEANFILES = \ mgcp \ *~ diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index b3fcd2875b..86eab58383 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.41 2003/09/02 21:26:22 guy Exp $ + * $Id: packet-mgcp.c,v 1.42 2003/09/05 07:44:49 jmayer Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -48,7 +48,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -1531,7 +1531,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset, /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am index a3d258a726..8bdc330fa0 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.1 2002/10/03 02:56:59 hagbard Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:49 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ pcli_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -pcli_la_DEPENDENCIES = packet-pcli-static.o - -packet-pcli-static.o: packet-pcli.c moduleinfo.h - $(LTCOMPILE) -c -o packet-pcli-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-pcli.c - CLEANFILES = \ pcli \ *~ diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c index 6a0e84191a..f9c198ae1b 100644 --- a/plugins/pcli/packet-pcli.c +++ b/plugins/pcli/packet-pcli.c @@ -4,7 +4,7 @@ * http://www.packetcable.com/downloads/specs/pkt-sp-esp-I01-991229.pdf * Chapter 4 ( Call Content Connection Interface ) * - * $Id: packet-pcli.c,v 1.7 2003/02/25 18:43:38 guy Exp $ + * $Id: packet-pcli.c,v 1.8 2003/09/05 07:44:50 jmayer Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -52,7 +52,7 @@ /* Define version if we are not building ethereal statically */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -177,7 +177,7 @@ proto_reg_handoff_pcli(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am index c19ae815e2..cccdd4f756 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.1 2003/06/11 09:17:03 guy Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:50 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ rtnet_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -rtnet_la_DEPENDENCIES = packet-rtnet-static.o - -packet-rtnet-static.o: packet-rtnet.c moduleinfo.h - $(LTCOMPILE) -c -o packet-rtnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-rtnet.c - CLEANFILES = \ rtnet \ *~ diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c index 5520548ecb..2e857d73d5 100644 --- a/plugins/rtnet/packet-rtnet.c +++ b/plugins/rtnet/packet-rtnet.c @@ -1,7 +1,7 @@ /* packet-rtnet.c * Routines for RTnet packet disassembly * - * $Id: packet-rtnet.c,v 1.3 2003/08/17 01:05:21 guy Exp $ + * $Id: packet-rtnet.c,v 1.4 2003/09/05 07:44:50 jmayer Exp $ * * Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com> * @@ -50,7 +50,7 @@ /* Define version if we are not building ethereal statically */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -724,7 +724,7 @@ proto_reg_handoff_rtnet(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ |