Convert most other plugin dissectors to use the make-dissector-reg

scripts.

svn path=/trunk/; revision=17961

5 files changed, 167 insertions, 55 deletions

diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 0b4c1bab07..773a6ea450 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -1,34 +1,39 @@
 # Makefile.am
-# Automake file for Ethereal/IrDA
+# Automake file for IrDA plugin
 #
 # $Id$
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
 # Copyright 1998 Gerald Combs
-#
+# 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-#
+# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(includedir)
+
+include Makefile.common
 
 plugindir = @plugindir@
 
 plugin_LTLIBRARIES = irda.la
-irda_la_SOURCES = packet-irda.c moduleinfo.h irda-appl.h packet-ircomm.c \
-	packet-sir.c
+irda_la_SOURCES = \
+	plugin.c \
+	moduleinfo.h \
+	$(DISSECTOR_SRC) \
+	$(DISSECTOR_INCLUDES)
 irda_la_LDFLAGS = -module -avoid-version
 irda_la_LIBADD = @PLUGIN_LIBS@
 
@@ -37,6 +42,69 @@ irda_la_LIBADD = @PLUGIN_LIBS@
 # add them here.
 LIBS =
 
+#
+# Build plugin.c, which contains the plugin version[] string, a
+# function plugin_register() that calls the register routines for all
+# protocols, and a function plugin_reg_handoff() that calls the handoff
+# registration routines for all protocols.
+#
+# We do this by scanning sources.  If that turns out to be too slow,
+# maybe we could just require every .o file to have an register routine
+# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
+#
+# Formatting conventions:  The name of the proto_register_* routines an
+# proto_reg_handoff_* routines must start in column zero, or must be
+# preceded only by "void " starting in column zero, and must not be
+# inside #if.
+#
+# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
+#
+# For some unknown reason, having a big "for" loop in the Makefile
+# to scan all the files doesn't work with some "make"s; they seem to
+# pass only the first few names in the list to the shell, for some
+# reason.
+#
+# Therefore, we have a script to generate the plugin.c file.
+# The shell script runs slowly, as multiple greps and seds are run
+# for each input file; this is especially slow on Windows.  Therefore,
+# if Python is present (as indicated by PYTHON being defined), we run
+# a faster Python script to do that work instead.
+#
+# The first argument is the directory in which the source files live.
+# The second argument is "plugin", to indicate that we should build
+# a plugin.c file for a plugin.
+# All subsequent arguments are the files to scan.
+#
+plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
+	@if test -n $(PYTHON); then \
+		echo Making plugin.c with python ; \
+		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		    plugin $(DISSECTOR_SRC) ; \
+	else \
+		echo Making plugin.c with shell script ; \
+		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
+		    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
+	fi
+
+#
+# Currently plugin.c can be included in the distribution because
+# we always build all protocol dissectors. We used to have to check
+# whether or not to build the snmp dissector. If we again need to
+# variably build something, making plugin.c non-portable, uncomment
+# the dist-hook line below.
+#
+# Oh, yuk.  We don't want to include "plugin.c" in the distribution, as
+# its contents depend on the configuration, and therefore we want it
+# to be built when the first "make" is done; however, Automake insists
+# on putting *all* source into the distribution.
+#
+# We work around this by having a "dist-hook" rule that deletes
+# "plugin.c", so that "dist" won't pick it up.
+#
+#dist-hook:
+#	@rm -f $(distdir)/plugin.c
+
 CLEANFILES = \
 	irda \
 	*~
@@ -45,4 +113,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 EXTRA_DIST = \
+	Makefile.common		\
 	Makefile.nmake
diff --git a/plugins/irda/Makefile.common b/plugins/irda/Makefile.common
new file mode 100644
index 0000000000..92b0a50ba3
--- /dev/null
+++ b/plugins/irda/Makefile.common
@@ -0,0 +1,37 @@
+# Makefile.common for IrDA plugin
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id$
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@ethereal.com>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# the name of the plugin
+PLUGIN_NAME = irda
+
+# the dissector sources (without any helpers)
+DISSECTOR_SRC = \
+	packet-ircomm.c \
+	packet-irda.c \
+	packet-sir.c
+
+# corresponding headers
+DISSECTOR_INCLUDES =	\
+	irda-appl.h
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 1a51de7933..949fea2cc7 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -1,3 +1,5 @@
+# Makefile.nmake
+# nmake file for IrDA plugin
 #
 # $Id$
 #
@@ -6,6 +8,8 @@ include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
+include Makefile.common
+
 CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
@@ -15,16 +19,60 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 
-OBJECTS=packet-irda.obj packet-ircomm.obj packet-sir.obj
+DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
+
+OBJECTS=$(DISSECTOR_OBJECTS) plugin.obj
 
-irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
-	link -dll /out:irda.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
+ira.dll ira.exp ira.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) 
+	link -dll /out:ira.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH)  \
 	$(GLIB_LIBS)
 
+#
+# Build plugin.c, which contains the plugin version[] string, a
+# function plugin_register() that calls the register routines for all
+# protocols, and a function plugin_reg_handoff() that calls the handoff
+# registration routines for all protocols.
+#
+# We do this by scanning sources.  If that turns out to be too slow,
+# maybe we could just require every .o file to have an register routine
+# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
+#
+# Formatting conventions:  The name of the proto_register_* routines an
+# proto_reg_handoff_* routines must start in column zero, or must be
+# preceded only by "void " starting in column zero, and must not be
+# inside #if.
+#
+# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
+#
+# For some unknown reason, having a big "for" loop in the Makefile
+# to scan all the files doesn't work with some "make"s; they seem to
+# pass only the first few names in the list to the shell, for some
+# reason.
+#
+# Therefore, we have a script to generate the plugin.c file.
+# The shell script runs slowly, as multiple greps and seds are run
+# for each input file; this is especially slow on Windows.  Therefore,
+# if Python is present (as indicated by PYTHON being defined), we run
+# a faster Python script to do that work instead.
+#
+# The first argument is the directory in which the source files live.
+# The second argument is "plugin", to indicate that we should build
+# a plugin.c file for a plugin.
+# All subsequent arguments are the files to scan.
+#
+plugin.c: $(DISSECTOR_SRC)
+!IFDEF PYTHON
+	@echo Making plugin.c (using python)
+	@$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC)
+!ELSE
+	@echo Making plugin.c (using sh)
+	@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
+!ENDIF
+
 !ENDIF
 
 clean:
-	rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb
+	rm -f $(OBJECTS) ira.dll ira.exp ira.lib *.pdb
 
 distclean: clean
 
diff --git a/plugins/irda/irda-appl.h b/plugins/irda/irda-appl.h
index 683e03503e..038be597a3 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/irda/irda-appl.h
@@ -102,10 +102,4 @@ extern void proto_register_irsir(void);
     { "IrLPT",          irlpt_attr_dissector },             \
     { NULL,             NULL }
 
-/* Protocol initialisation */
-#define REGISTER_SUB_PROTOCOLS()    do {                    \
-        proto_register_ircomm();                            \
-        proto_register_irsir();                             \
-    } while (0)
-
 #endif /* __IRDA_APPL_H__ */
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index e58d818498..db757e60be 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -31,14 +31,11 @@
 # include "config.h"
 #endif
 
-#include "moduleinfo.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
-#include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
 #include <epan/conversation.h>
@@ -143,11 +140,6 @@
 #define TTP_PARAMETERS         0x80
 #define TTP_MORE               0x80
 
-
-#ifndef ENABLE_STATIC
-G_MODULE_EXPORT const gchar version[] = VERSION;
-#endif
-
 /* Initialize the protocol and registered fields */
 static int proto_irlap = -1;
 static int hf_lap_a = -1;
@@ -1952,7 +1944,7 @@ static void init_irda(void)
  * This format is required because a script is used to build the C function
  *  that calls all the protocol registrations.
  */
-static void proto_register_irda(void)
+void proto_register_irda(void)
 {
     unsigned i;
 
@@ -2314,7 +2306,7 @@ static void proto_register_irda(void)
 	create the code that calls these routines.
 */
 
-static void proto_reg_handoff_irda(void)
+void proto_reg_handoff_irda(void)
 {
     dissector_handle_t irda_handle;
 
@@ -2322,31 +2314,3 @@ static void proto_reg_handoff_irda(void)
     dissector_add("wtap_encap", WTAP_ENCAP_IRDA, irda_handle);
     data_handle = find_dissector("data");
 }
-
-
-/* Start the functions we need for the plugin stuff */
-
-#ifndef ENABLE_STATIC
-
-G_MODULE_EXPORT void
-plugin_register(void)
-{
-    /* register the new protocol, protocol fields, and subtrees */
-    if (proto_irlap == -1)
-    {
-        /* execute protocol initialization only once */
-        proto_register_irda();
-
-        REGISTER_SUB_PROTOCOLS();
-    }
-}
-
-G_MODULE_EXPORT void
-plugin_reg_handoff(void)
-{
-    proto_reg_handoff_irda();
-}
-
-#endif
-
-/* End the functions we need for plugin stuff */