Wireshark · Ethereal-dev: [Ethereal-dev] patch for plugin makefiles

[Lars Roland <lars.roland@xxxxxxx>]

Hello all,

attached is a patch for the plugin makefiles.

We have to define _NEED_VAR_IMPORT_ if we link the plugins with libethereal.
There are additional pdb files with the name of the plugin in each 
directory. We should remove all pdb files with clean.
Please check in.

I don't have any objections anymore against linking the plugins with 
libethereal by default. I leave it to you to enable the option 
LINK_PLUGINS_WITH_LIBETHEREAL in config.nmake.

Regards,
Lars


Index: ethereal-new/doc/README.plugins
===================================================================
--- ethereal-new/doc/README.plugins	(revision 12160)
+++ ethereal-new/doc/README.plugins	(working copy)
@@ -152,7 +152,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -164,7 +164,7 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) xxx.dll xxx.exp xxx.lib $(PDB_FILE)
+	rm -f $(OBJECTS) xxx.dll xxx.exp xxx.lib *.pdb
 
 distclean: clean
 
Index: ethereal-new/plugins/irda/Makefile.nmake
===================================================================
--- ethereal-new/plugins/irda/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/irda/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) irda.dll irda.exp irda.lib $(PDB_FILE)
+	rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/enttec/Makefile.nmake
===================================================================
--- ethereal-new/plugins/enttec/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/enttec/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib $(PDB_FILE)
+	rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/rdm/Makefile.nmake
===================================================================
--- ethereal-new/plugins/rdm/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/rdm/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/docsis/Makefile.nmake
===================================================================
--- ethereal-new/plugins/docsis/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/docsis/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -37,6 +37,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
+	rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/rlm/Makefile.nmake
===================================================================
--- ethereal-new/plugins/rlm/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/rlm/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/megaco/Makefile.nmake
===================================================================
--- ethereal-new/plugins/megaco/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/megaco/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
+	rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/rtnet/Makefile.nmake
===================================================================
--- ethereal-new/plugins/rtnet/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/rtnet/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/artnet/Makefile.nmake
===================================================================
--- ethereal-new/plugins/artnet/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/artnet/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
+	rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/ciscosm/Makefile.nmake
===================================================================
--- ethereal-new/plugins/ciscosm/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/ciscosm/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/acn/Makefile.nmake
===================================================================
--- ethereal-new/plugins/acn/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/acn/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) acn.dll acn.exp acn.lib $(PDB_FILE)
+	rm -f $(OBJECTS) acn.dll acn.exp acn.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/asn1/Makefile.nmake
===================================================================
--- ethereal-new/plugins/asn1/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/asn1/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib $(PDB_FILE)
+	rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/v5ua/Makefile.nmake
===================================================================
--- ethereal-new/plugins/v5ua/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/v5ua/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib $(PDB_FILE)
+	rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/gryphon/Makefile.nmake
===================================================================
--- ethereal-new/plugins/gryphon/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/gryphon/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
+	rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/mgcp/Makefile.nmake
===================================================================
--- ethereal-new/plugins/mgcp/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/mgcp/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
+	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/pcli/Makefile.nmake
===================================================================
--- ethereal-new/plugins/pcli/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/pcli/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
+	rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/lwres/Makefile.nmake
===================================================================
--- ethereal-new/plugins/lwres/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/lwres/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib $(PDB_FILE)
+	rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/giop/Makefile.nmake
===================================================================
--- ethereal-new/plugins/giop/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/giop/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -32,6 +32,6 @@
 
 clean:
 	rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
-		coseventcomm.dll coseventcomm.exp coseventcomm.lib $(PDB_FILE)
+		coseventcomm.dll coseventcomm.exp coseventcomm.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/rudp/Makefile.nmake
===================================================================
--- ethereal-new/plugins/rudp/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/rudp/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib *.pdb
 
 distclean: clean
Index: ethereal-new/plugins/opsi/Makefile.nmake
===================================================================
--- ethereal-new/plugins/opsi/Makefile.nmake	(revision 12160)
+++ ethereal-new/plugins/opsi/Makefile.nmake	(working copy)
@@ -13,7 +13,7 @@
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib $(PDB_FILE)
+	rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib *.pdb
 
 distclean: clean