From Lars Roland: we need to define _NEED_VAR_IMPORT_ in plugins if we

link the plugins with libethereal, so do so.

svn path=/trunk/; revision=12176

diff --git a/doc/README.plugins b/doc/README.plugins
index 05e255f01127ab52b87065649ec5995809a70e09..cbc78078ebd487be9b93b9c23b83aba405449124 100644 (file)
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -152,7 +152,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ xxx.dll xxx.exp xxx.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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
 

diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
index eff4ab8ab2917738fd5da63d5f527158440124fe..4ceba3aed137511ff9d2301f753bde7eba6edc1b 100644 (file)
--- a/plugins/acn/Makefile.nmake
+++ b/plugins/acn/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ acn.dll acn.exp acn.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 2bdd33c41f4a2c867adbd3b0f41f6e8e1d05e4d0..4e9da257d01683a9af23e057f9a6bed3423147f7 100644 (file)
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ artnet.dll artnet.exp artnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 62cd2584f8994139aa64aab0af5504135a84b8ab..73f83e74de129e29ec90e8c1d2ca389a19ba7420 100644 (file)
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ asn1.dll asn1.exp asn1.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index 1bb8fddc9f7d8fc9d2851a564da7abed98bfefc8..9fa83fa1a6ec9a9a99002b9d04e888b879f2df3f 100644 (file)
--- a/plugins/ciscosm/Makefile.nmake
+++ b/plugins/ciscosm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ ciscosm.dll ciscosm.exp ciscosm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index bb7d7814e3d1f7c47ebbb6b9da8f6c74f41c5fec..79114fe5715ff476fc1ba4258dae2dbe0813decb 100644 (file)
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index c59c90c46c2a54fb03fc2cbd753a8635001f7dd5..48e8132bedf027c01e4e7ad0cdecbee428713343 100644 (file)
--- a/plugins/enttec/Makefile.nmake
+++ b/plugins/enttec/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ enttec.dll enttec.exp enttec.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 35be3bffa540bbb5a5b4b6c6471a4225f6786814..1a9bbde5c70a1a52dae1d1f16b5f10567ce5ecaf 100644 (file)
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(L
 
 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

diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index d849d3191d20badf8da1bc86c203d37b40052e08..3ccaecd68af6fec09a8ba92743ae73492482ae06 100644 (file)
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 2ba66ecbe074e4ea32ea9fad5663e5f09552944f..94fd393261f469dce23b27b2f0559a9ca9b3bf87 100644 (file)
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index d3ce47a21b344e4aeca033f18968fb0cf0747df4..b89d11154a4587688857af24ac85de026cbae78c 100644 (file)
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ lwres.dll lwres.exp lwres.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index daa9947e2f0966e2d591572de9100edc8062b1e2..19efb9dc40c9a64e2996c7854ac52d6e8c496375 100644 (file)
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ megaco.dll megaco.exp megaco.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index b2104b1831a14528d9e9a0373e0c357cc75d3992..ff575af6cda34438b191282ca46313672eff4a0b 100644 (file)
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ mgcp.dll mgcp.exp mgcp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake
index c185d374125093a7c3276eb4083ddbaa97dbde6f..9840c8e090fb9f72460b7cdf1b656f86ac2d784c 100644 (file)
--- a/plugins/opsi/Makefile.nmake
+++ b/plugins/opsi/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ opsi.dll opsi.exp opsi.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 1241cc42462cd4f2a07561d422065dd13690da15..c0cbc55661ad5a363154afb7217886781aa43201 100644 (file)
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ pcli.dll pcli.exp pcli.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake
index 9c6ddc75244843fbda31332b7a7fbdf20885b194..803243cd36e38a829b42568eb4e683afc57d4c6f 100644 (file)
--- a/plugins/rdm/Makefile.nmake
+++ b/plugins/rdm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ rdm.dll rdm.exp rdm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index 86306a2891c68cf6044ef6b4c5847ce59b4761a0..a8aef8fa7d8d8ed8f2c853288a5aeea441b1bfc3 100644 (file)
--- a/plugins/rlm/Makefile.nmake
+++ b/plugins/rlm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ rlm.dll rlm.exp rlm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index 698607e00695136981c918a4fd58aaa0fdfef952..f3bf512ede9df5e42d1f442db0daa125eda5f8c2 100644 (file)
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index e7440ed41fc16dc4197e001300a4dfac6d2994e1..c61f23555110f518384103a815a76c2010e7c301 100644 (file)
--- a/plugins/rudp/Makefile.nmake
+++ b/plugins/rudp/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ rudp.dll rudp.exp rudp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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

diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index 3ee454fb44df13c3eade9cc05b779c9e97bd7b92..bf04762ca2c617807152a4596c80091c9f832fe1 100644 (file)
--- a/plugins/v5ua/Makefile.nmake
+++ b/plugins/v5ua/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !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 @@ v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        $(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