Make files more generic.

svn path=/trunk/; revision=21864

plugins/opcua/Makefile.nmake

@@ -1,5 +1,5 @@
 # Makefile.nmake
-# nmake file for OpcUa plugin
+# nmake file for Wireshark plugin
 #
 # $Id$
 #
@@ -12,10 +12,10 @@ include Makefile.common
 CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
-LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
-LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\epan\dissectors\dissectors.lib
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
 CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)

plugins/opcua/opcua.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>

plugins/opcua/opcua_application_layer.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_simpletypes.h"
 

plugins/opcua/opcua_complextypeparser.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_complextypeparser.h"
 #include "opcua_enumparser.h"

plugins/opcua/opcua_complextypeparser.h

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 void parseReferenceNode(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldName);

plugins/opcua/opcua_enumparser.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 #include "opcua_enumparser.h"

plugins/opcua/opcua_enumparser.h

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 void parseNodeClass(proto_tree *tree, tvbuff_t *tvb, gint *pOffset);

plugins/opcua/opcua_hfindeces.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 int hf_opcua_TestId = -1;

plugins/opcua/opcua_hfindeces.h

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 extern int hf_opcua_TestId;

plugins/opcua/opcua_identifiers.h

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 /* declare service parser function prototype */

plugins/opcua/opcua_security_layer.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_application_layer.h"
 #include "opcua_simpletypes.h"

plugins/opcua/opcua_serviceparser.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_serviceparser.h"
 #include "opcua_complextypeparser.h"

plugins/opcua/opcua_serviceparser.h

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 void parseTestStackRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset);

plugins/opcua/opcua_servicetable.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_identifiers.h"
 #include "opcua_serviceparser.h"

plugins/opcua/opcua_simpletypes.c

@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include <epan/dissectors/packet-windows-common.h>
 #include "opcua_simpletypes.h"

plugins/opcua/opcua_transport_layer.c

@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_security_layer.h"
 #include "opcua_application_layer.h"