- 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)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8389 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index dca121ac137adfc9c337418d061770e92ed70eae..0bed5f41bc93a70c1002e4bcd19ff9779c79db16 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.621 2003/09/03 22:26:37 guy Exp $
+# $Id: Makefile.am,v 1.622 2003/09/05 07:44:44 jmayer Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -458,38 +458,38 @@ plugin_libs = \
 
 if ENABLE_STATIC
 plugin_ldadd = \
-       plugins/artnet/packet-artnet-static.o \
-       plugins/docsis/packet-bpkmattr-static.o \
-       plugins/docsis/packet-bpkmreq-static.o \
-       plugins/docsis/packet-bpkmrsp-static.o \
-       plugins/docsis/packet-docsis-static.o \
-       plugins/docsis/packet-dsaack-static.o \
-       plugins/docsis/packet-dsareq-static.o \
-       plugins/docsis/packet-dsarsp-static.o \
-       plugins/docsis/packet-dscack-static.o \
-       plugins/docsis/packet-dscreq-static.o \
-       plugins/docsis/packet-dscrsp-static.o \
-       plugins/docsis/packet-dsdreq-static.o \
-       plugins/docsis/packet-dsdrsp-static.o \
-       plugins/docsis/packet-macmgmt-static.o \
-       plugins/docsis/packet-map-static.o \
-       plugins/docsis/packet-regack-static.o \
-       plugins/docsis/packet-regreq-static.o \
-       plugins/docsis/packet-regrsp-static.o \
-       plugins/docsis/packet-rngreq-static.o \
-       plugins/docsis/packet-rngrsp-static.o \
-       plugins/docsis/packet-tlv-static.o \
-       plugins/docsis/packet-uccreq-static.o \
-       plugins/docsis/packet-uccrsp-static.o \
-       plugins/docsis/packet-ucd-static.o \
-       plugins/giop/packet-cosnaming-static.o \
-       plugins/giop/packet-coseventcomm-static.o \
-       plugins/gryphon/packet-gryphon-static.o \
-       plugins/lwres/packet-lwres-static.o \
-       plugins/megaco/packet-megaco-static.o \
-       plugins/mgcp/packet-mgcp-static.o \
-       plugins/pcli/packet-pcli-static.o \
-       plugins/rtnet/packet-rtnet-static.o 
+       plugins/artnet/packet-artnet.o \
+       plugins/docsis/packet-bpkmattr.o \
+       plugins/docsis/packet-bpkmreq.o \
+       plugins/docsis/packet-bpkmrsp.o \
+       plugins/docsis/packet-docsis.o \
+       plugins/docsis/packet-dsaack.o \
+       plugins/docsis/packet-dsareq.o \
+       plugins/docsis/packet-dsarsp.o \
+       plugins/docsis/packet-dscack.o \
+       plugins/docsis/packet-dscreq.o \
+       plugins/docsis/packet-dscrsp.o \
+       plugins/docsis/packet-dsdreq.o \
+       plugins/docsis/packet-dsdrsp.o \
+       plugins/docsis/packet-macmgmt.o \
+       plugins/docsis/packet-map.o \
+       plugins/docsis/packet-regack.o \
+       plugins/docsis/packet-regreq.o \
+       plugins/docsis/packet-regrsp.o \
+       plugins/docsis/packet-rngreq.o \
+       plugins/docsis/packet-rngrsp.o \
+       plugins/docsis/packet-tlv.o \
+       plugins/docsis/packet-uccreq.o \
+       plugins/docsis/packet-uccrsp.o \
+       plugins/docsis/packet-ucd.o \
+       plugins/giop/packet-cosnaming.o \
+       plugins/giop/packet-coseventcomm.o \
+       plugins/gryphon/packet-gryphon.o \
+       plugins/lwres/packet-lwres.o \
+       plugins/megaco/packet-megaco.o \
+       plugins/mgcp/packet-mgcp.o \
+       plugins/pcli/packet-pcli.o \
+       plugins/rtnet/packet-rtnet.o 
 
 plugin_src = \
        plugins/artnet/packet-artnet.c \

diff --git a/configure.in b/configure.in
index 6869a1f89992f8f1f82cc1fff472e48de8988e26..2694fbf5309a77a311ea321c801dc991985d9a12 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.218 2003/08/29 04:20:22 sharpe Exp $
+# $Id: configure.in,v 1.219 2003/09/05 07:44:44 jmayer Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -777,7 +777,13 @@ dnl libtool defs
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
-AM_CONDITIONAL(ENABLE_STATIC, test x$enable_shared = xno)
+AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
+if test x$enable_static = xyes -a x$have_plugins = xyes
+then
+  AC_DEFINE(ENABLE_STATIC, 1, [Link plugins statically into Ethereal])
+fi
+AC_SUBST(ENABLE_STATIC)
+
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SUBDIRS(epan wiretap)
 AC_OUTPUT(

diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index f75e9dd70f708637bd99d79fbad3bb55d057fd41..be5371857ff98596eac567b403a8e2ef92182bf4 100644 (file)
--- 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 a5ec14c20ecd578f2ec4b23b10a12dcd7f9bef48..5b176a5e55f5932250c6aedf709de1ff5e4de50e 100644 (file)
--- 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 b101f3672ba0e79c58803a97be417b9519af3808..3296a842d1f6dc35cb8d5c77b47aa639cbc03953 100644 (file)
--- 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 cde94de4be4d34fefe07ac191381ea9b38d71c1f..b408392cb385fdeff17c9b5293e6b14c1f82b335 100644 (file)
--- 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 d6475a9cdab32e1d3212a1755275a3df4566bcbf..b10949959e76ab1964b50feb89b3c9bbe440280c 100644 (file)
--- 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 161f8672ddab4555c0b08225cc31101117cb1e0e..fc41bfab5e1eeee3c61af8a1d6c5ed8eb933351e 100644 (file)
--- 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 1774ac60362487288b7cfce5548fcc76e8919f16..b8e90e935fab8d6f32272ab11ad2deb69641c193 100644 (file)
--- 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 889f2bd9210068de87d5698e4d821a488cb9855d..f210784cd9cf958f5bfa2e1b0f4d81585033519b 100644 (file)
--- 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 13bae87b1eb95913bdfb0e61f69ec57a4ada353c..c9c977010fe410a49190c82c23d15b7d69febb5f 100644 (file)
--- 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 b961e78cd7f269d55590d8c8a9f0dc3758ee319e..d6b1d96cf8006b4bc9b97344ae306ab301e78b51 100644 (file)
--- 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 926614f266efcfc004b536f04ff981e6495fb045..e5ff0b2492a7abeb3a7369f6230bbc5f2a7e5281 100644 (file)
--- 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 d7465c8bed27a687d4f194c240684328f30f23cf..21ed2d45abd2cde28dd1abec2881563bb554f7ea 100644 (file)
--- 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 01d7e0c299637d97dbe995e413899187df5a92c8..99ebed59fb14daddb1366af7ac715d1a887948a8 100644 (file)
--- 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 ee47098c7647510ba9f9929d2a0ab4d271f87a7c..3683b24ec2e17cb6253ad920a191718b1f3c058f 100644 (file)
--- 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 b3fcd2875b7bb288ac7a9fced9ff21b70e8aeca7..86eab58383ead8498f0659f2bd7073fc044e935f 100644 (file)
--- 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 a3d258a7263b6dcde7c5cb025d9ea96b108c7dba..8bdc330fa01baedd60526bea5559d23cee161380 100644 (file)
--- 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 6a0e84191abf783592ea74d53ed9cd3bdcf1ab3b..f9c198ae1be5dcb35f03e6e596606c40c0bf53d8 100644 (file)
--- 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 c19ae815e252269f6432e5220f43712236eaaee1..cccdd4f756725c0ac709601e92d363f5fa2a8868 100644 (file)
--- 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 5520548ecb24b8a7e883cabca6090020abbe66cc..2e857d73d5898571bff209e8c873645916afdebf 100644 (file)
--- 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){