From Matthijs Melchior:

	move the initialization of the addresses in the plugin interface
	structure from run-time to link time;

	don't attempt to rebuild the X* files automatically, just warn
	that they're out of date and show the command used to rebuild
	them (not everybody has GCC installed, but it's required in
	order to rebuild them).

Get rid of the checked-in Xepan_plugins.c, as it's no longer generated
or used.

Fix Makefile.am now that Xepan_plugins.c has been replaced by Xass-list.

Give plugin_gen.py an RCS ID.

svn path=/trunk/; revision=8186

epan/plugins.c

@@ -1,7 +1,7 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.74 2003/07/18 03:01:32 guy Exp $
+ * $Id: plugins.c,v 1.75 2003/08/18 20:17:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -68,7 +68,10 @@
 #include "tap.h"
 #include "asn1.h"
 #include "plugins/plugin_table.h"
-static plugin_address_table_t	patable;
+static plugin_address_table_t	patable = {
+/* file generated by plugin_gen.py */
+#include "plugins/Xass-list"
+};
 #endif
 
 /* linked list of all plugins */
@@ -314,12 +317,6 @@ init_plugins(const char *plugin_dir)
 
     if (plugin_list == NULL)      /* ensure init_plugins is only run once */
     {
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-	/* Intialize address table */
-/* file generated by plugin_gen.py */
-#include "../plugins/Xepan_plugins.c"
-#endif
-
 #ifdef WIN32
 	/*
 	 * On Windows, the data file directory is the installation

plugins/Makefile.am

@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.20 2003/08/05 05:03:29 guy Exp $
+# $Id: Makefile.am,v 1.21 2003/08/18 20:17:55 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,7 @@ SUBDIRS = artnet docsis giop gryphon lwres megaco mgcp pcli rtnet
 plugindir = @plugindir@
 
 ADDRESS_EXPORT_FILES = \
-	Xepan_plugins.c	\
+	Xass-list	\
 	Xplugin_api.c	\
 	Xplugin_api.h	\
 	Xplugin_api_decls.h	\
@@ -47,15 +47,14 @@ EXTRA_DIST = \
 	plugin_gen.py	\
 	plugin_table.h	\
 	Makefile.nmake	\
-	Xepan_plugins.c	\
+	Xass-list	\
 	Xplugin_api.c	\
 	Xplugin_api.h	\
 	Xplugin_api_decls.h	\
 	Xplugin_table.h
 
 CLEANFILES = \
 	Xass-list	\
-	Xepan_plugins.c	\
 	Xplugin_api.c	\
 	Xplugin_api.h	\
 	Xplugin_api_decls.h	\

plugins/Makefile.nmake

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.22 2003/08/05 05:03:29 guy Exp $
+# $Id: Makefile.nmake,v 1.23 2003/08/18 20:17:55 guy Exp $
 #
 
 include ..\config.nmake
@@ -13,13 +13,16 @@ OBJECTS=plugin_api.obj
 
 all: $(OBJECTS) artnet docsis giop gryphon lwres megaco mgcp pcli rtnet
 
-Xplugin_api.c: xyzzy plugin_gen.py plugin_api.c
-	$(PYTHON) plugin_gen.py xyzzy
+Xplugin_api.c: plugin_gen.py plugin_api_list.c
+	@echo **** Plugin api may be out of date, please generate new files:
+	@echo **** nmake -f Makefile.nmake xyzzy
+	@echo.
 
 plugin_api.obj: plugin_api.c Xplugin_api.c
 
-xyzzy: plugin_api_list.c
+xyzzy: plugin_gen.py plugin_api_list.c
 	gcc -aux-info xyzzy -DHAVE_CONFIG_H -I$(GLIB_DIR) -I.. -c plugin_api_list.c
+	$(PYTHON) plugin_gen.py xyzzy
 
 artnet:: 
 	cd artnet