From 1ca10ac96d5a412cac13a8bcb95d18776a233b21 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 29 Sep 2004 19:30:10 +0000 Subject: From Lars Roland: add an option to link plugins with libethereal rather than using the plugin address table. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12139 f5534014-38df-0310-8fa8-9805f1628bb7 --- Makefile.nmake | 1 - config.h.win32 | 21 ++++++++++----------- config.nmake | 5 +++++ doc/README.plugins | 13 +++++++++++-- plugins/acn/Makefile.nmake | 13 +++++++++++-- plugins/artnet/Makefile.nmake | 13 +++++++++++-- plugins/asn1/Makefile.nmake | 13 +++++++++++-- plugins/ciscosm/Makefile.nmake | 13 +++++++++++-- plugins/docsis/Makefile.nmake | 13 +++++++++++-- plugins/enttec/Makefile.nmake | 13 +++++++++++-- plugins/giop/Makefile.nmake | 17 +++++++++++++---- plugins/gryphon/Makefile.nmake | 13 +++++++++++-- plugins/irda/Makefile.nmake | 13 +++++++++++-- plugins/lwres/Makefile.nmake | 13 +++++++++++-- plugins/megaco/Makefile.nmake | 13 +++++++++++-- plugins/mgcp/Makefile.nmake | 16 +++++----------- plugins/mgcp/packet-mgcp.c | 10 ---------- plugins/opsi/Makefile.nmake | 13 +++++++++++-- plugins/pcli/Makefile.nmake | 13 +++++++++++-- plugins/rdm/Makefile.nmake | 13 +++++++++++-- plugins/rlm/Makefile.nmake | 13 +++++++++++-- plugins/rtnet/Makefile.nmake | 13 +++++++++++-- plugins/rudp/Makefile.nmake | 13 +++++++++++-- plugins/v5ua/Makefile.nmake | 13 +++++++++++-- 24 files changed, 231 insertions(+), 73 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index 7a71cda928..331346ab6a 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -213,7 +213,6 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \ -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \ -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ - -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \ < config.h.win32 > $@ ps.c : rdps.exe print.ps diff --git a/config.h.win32 b/config.h.win32 index c6d4d9cee1..02e5719e59 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -33,6 +33,16 @@ #define HAVE_PLUGINS 1 #define PLUGINS_NEED_ADDRESS_TABLE 1 +/* Plugins can also use the import library of libethereal.dll instead + of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE + for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally. + Thus Ethereal will be still able to load plugins using the old API. + The macro HAVE_WIN32_LIBETHEREAL_LIB has to be defined in plugin's + makefile.nmake. A template is available in doc/README.plugins */ +#ifdef HAVE_WIN32_LIBETHEREAL_LIB +#undef PLUGINS_NEED_ADDRESS_TABLE +#endif + /* #undef HAVE_SA_LEN */ /* #undef NEED_SNPRINTF_H */ @@ -169,17 +179,6 @@ /* Define to use the PCRE library */ @HAVE_PCRE@ -@HAVE_LIBETHEREALDLL@ - -/* define macro for importing variables from an dll - * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_ - */ -#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL) -# define ETH_VAR_IMPORT __declspec(dllimport) extern -#else -# define ETH_VAR_IMPORT extern -#endif - #ifndef WIN32 #define WIN32 1 #endif diff --git a/config.nmake b/config.nmake index 0cdffd68eb..ad19c29b43 100644 --- a/config.nmake +++ b/config.nmake @@ -222,6 +222,11 @@ MAKENSIS_MODERN_UI=USE # following line ENABLE_LIBETHEREAL=USE +!IFDEF ENABLE_LIBETHEREAL +# Uncomment next line to link plugins with the import library of libethereal.dll +#LINK_PLUGINS_WITH_LIBETHEREAL=USE +!ENDIF + # # You should not have to change anything below this comment. # If you do, it's a deficiency in the Makefile.nmake files; diff --git a/doc/README.plugins b/doc/README.plugins index 2fbc865c1b..05e255f011 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -148,10 +148,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-xxx.obj -xxx.dll xxx.exp xxx.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:xxx.dll $(OBJECTS) ..\plugin_api.obj \ +xxx.dll xxx.exp xxx.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:xxx.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake index a0140a91e4..eff4ab8ab2 100644 --- a/plugins/acn/Makefile.nmake +++ b/plugins/acn/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-acn.obj -acn.dll acn.exp acn.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:acn.dll $(OBJECTS) ..\plugin_api.obj \ +acn.dll acn.exp acn.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:acn.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake index 16f0372189..2bdd33c41f 100644 --- a/plugins/artnet/Makefile.nmake +++ b/plugins/artnet/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-artnet.obj -artnet.dll artnet.exp artnet.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:artnet.dll $(OBJECTS) ..\plugin_api.obj \ +artnet.dll artnet.exp artnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:artnet.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 02bc5b4b26..62cd2584f8 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-asn1.obj -asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \ +asn1.dll asn1.exp asn1.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:asn1.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake index 21017ebd59..1bb8fddc9f 100644 --- a/plugins/ciscosm/Makefile.nmake +++ b/plugins/ciscosm/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-sm.obj -ciscosm.dll ciscosm.exp ciscosm.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:ciscosm.dll $(OBJECTS) ..\plugin_api.obj \ +ciscosm.dll ciscosm.exp ciscosm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:ciscosm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index ab5f331d98..bb7d7814e3 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -9,6 +9,15 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-intrngreq.obj packet-type29ucd.obj \ packet-docsis.obj packet-bpkmattr.obj \ packet-dsarsp.obj packet-macmgmt.obj \ @@ -23,8 +32,8 @@ OBJECTS=packet-intrngreq.obj packet-type29ucd.obj \ packet-dsareq.obj packet-dsdrsp.obj \ packet-rngreq.obj packet-vendor.obj -docsis.dll docsis.exp docsis.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:docsis.dll $(OBJECTS) ..\plugin_api.obj \ +docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:docsis.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake index 7a4cbf3a9b..c59c90c46c 100644 --- a/plugins/enttec/Makefile.nmake +++ b/plugins/enttec/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-enttec.obj -enttec.dll enttec.exp enttec.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:enttec.dll $(OBJECTS) ..\plugin_api.obj \ +enttec.dll enttec.exp enttec.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:enttec.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index eb65154b45..35be3bffa5 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -9,16 +9,25 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj all : cosnaming.dll coseventcomm.dll -cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj ..\plugin_api.obj - link -dll /out:cosnaming.dll packet-cosnaming.obj ..\plugin_api.obj \ +cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj $(LINK_PLUGIN_WITH) + link -dll /out:cosnaming.dll $(LDFLAGS) packet-cosnaming.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) -coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\plugin_api.obj - link -dll /out:coseventcomm.dll packet-coseventcomm.obj ..\plugin_api.obj \ +coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(LINK_PLUGIN_WITH) + link -dll /out:coseventcomm.dll $(LDFLAGS) packet-coseventcomm.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index 72f8f5ad79..d849d3191d 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-gryphon.obj -gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:gryphon.dll $(OBJECTS) ..\plugin_api.obj \ +gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:gryphon.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index af828558bf..2ba66ecbe0 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-irda.obj packet-ircomm.obj packet-sir.obj -irda.dll irda.exp irda.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:irda.dll $(OBJECTS) ..\plugin_api.obj \ +irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:irda.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake index 3bc05a84a8..d3ce47a21b 100644 --- a/plugins/lwres/Makefile.nmake +++ b/plugins/lwres/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-lwres.obj -lwres.dll lwres.exp lwres.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:lwres.dll $(OBJECTS) ..\plugin_api.obj \ +lwres.dll lwres.exp lwres.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:lwres.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake index 6d95fb4cc9..daa9947e2f 100644 --- a/plugins/megaco/Makefile.nmake +++ b/plugins/megaco/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-megaco.obj -megaco.dll megaco.exp megaco.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:megaco.dll $(OBJECTS) ..\plugin_api.obj \ +megaco.dll megaco.exp megaco.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:megaco.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake index 70d3d1cdf1..b2104b1831 100644 --- a/plugins/mgcp/Makefile.nmake +++ b/plugins/mgcp/Makefile.nmake @@ -4,30 +4,24 @@ include ..\..\config.nmake -# If you want this plugin to use libethereal.lib instead -# of the standard plugin api, you have to comment out the next line -#USE_LIBETHEREAL_LIB=YES - ############### no need to modify below this line ######### CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -!IFDEF ENABLE_LIBETHEREAL -!IFDEF USE_LIBETHEREAL_LIB +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) -!ENDIF -!ENDIF - -!IFNDEF LINK_PLUGIN_WITH +!ELSE LINK_PLUGIN_WITH=..\plugin_api.obj !ENDIF OBJECTS=packet-mgcp.obj mgcp.dll mgcp.exp mgcp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) - link -dll /out:mgcp.dll $(OBJECTS) $(LINK_PLUGIN_WITH) \ + link -dll /out:mgcp.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 154b68b5ac..7c5ef9c21e 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -36,9 +36,7 @@ #include "config.h" #endif -#ifndef HAVE_WIN32_LIBETHEREAL_LIB #include "plugins/plugin_api.h" -#endif #include "moduleinfo.h" @@ -56,9 +54,7 @@ #include #include "packet-mgcp.h" -#ifndef HAVE_WIN32_LIBETHEREAL_LIB #include "plugins/plugin_api_defs.h" -#endif #ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; @@ -1725,8 +1721,6 @@ plugin_reg_handoff(void){ proto_reg_handoff_mgcp(); } -#ifndef HAVE_WIN32_LIBETHEREAL_LIB - G_MODULE_EXPORT void plugin_init(plugin_address_table_t *pat #ifndef PLUGINS_NEED_ADDRESS_TABLE @@ -1736,10 +1730,6 @@ _U_ /* initialise the table of pointers needed in Win32 DLLs */ plugin_address_table_init(pat); -#else /* HAVE_WIN32_LIBETHEREAL_LIB */ -G_MODULE_EXPORT void plugin_init(void *dummy _U_) -{ -#endif /* register the new protocol, protocol fields, and subtrees */ if (proto_mgcp == -1) { /* execute protocol initialization only once */ proto_register_mgcp(); diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake index 47d130cea5..c185d37412 100644 --- a/plugins/opsi/Makefile.nmake +++ b/plugins/opsi/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-opsi.obj -opsi.dll opsi.exp opsi.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:opsi.dll $(OBJECTS) ..\plugin_api.obj \ +opsi.dll opsi.exp opsi.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:opsi.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake index 69e613a3e1..1241cc4246 100644 --- a/plugins/pcli/Makefile.nmake +++ b/plugins/pcli/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-pcli.obj -pcli.dll pcli.exp pcli.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:pcli.dll $(OBJECTS) ..\plugin_api.obj \ +pcli.dll pcli.exp pcli.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:pcli.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake index 8f6276fcc2..9c6ddc7524 100644 --- a/plugins/rdm/Makefile.nmake +++ b/plugins/rdm/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-rdm.obj -rdm.dll rdm.exp rdm.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:rdm.dll $(OBJECTS) ..\plugin_api.obj \ +rdm.dll rdm.exp rdm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:rdm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake index 3d72d58ffa..86306a2891 100644 --- a/plugins/rlm/Makefile.nmake +++ b/plugins/rlm/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-rlm.obj -rlm.dll rlm.exp rlm.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:rlm.dll $(OBJECTS) ..\plugin_api.obj \ +rlm.dll rlm.exp rlm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:rlm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake index af4e114eb8..698607e006 100644 --- a/plugins/rtnet/Makefile.nmake +++ b/plugins/rtnet/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-rtnet.obj -rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:rtnet.dll $(OBJECTS) ..\plugin_api.obj \ +rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:rtnet.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake index 3ff1a9fb99..e7440ed41f 100644 --- a/plugins/rudp/Makefile.nmake +++ b/plugins/rudp/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-rudp.obj -rudp.dll rudp.exp rudp.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:rudp.dll $(OBJECTS) ..\plugin_api.obj \ +rudp.dll rudp.exp rudp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:rudp.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake index a1afdddce9..3ee454fb44 100644 --- a/plugins/v5ua/Makefile.nmake +++ b/plugins/v5ua/Makefile.nmake @@ -9,10 +9,19 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +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) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-v5ua.obj -v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) ..\plugin_api.obj - link -dll /out:v5ua.dll $(OBJECTS) ..\plugin_api.obj \ +v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) + link -dll /out:v5ua.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: -- cgit v1.2.3