Use $(PLUGIN_LDFLAGS) for LDFLAGS.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21963 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/agentx/Makefile.nmake
+++ b/plugins/agentx/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/ciscosm/Makefile.nmake
+++ b/plugins/ciscosm/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/enttec/Makefile.nmake
+++ b/plugins/enttec/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/h223/Makefile.nmake b/plugins/h223/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/h223/Makefile.nmake
+++ b/plugins/h223/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index f3856cbb7ad38b771e5e383fe7d954f194b4fda4..61e135700cec1c54737c9bdab2e98a6ca48f13c3 100644 (file)
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -12,7 +12,7 @@ include Makefile.common
 CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../wimax /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

diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/opsi/Makefile.nmake
+++ b/plugins/opsi/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/rlm/Makefile.nmake
+++ b/plugins/rlm/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/rudp/Makefile.nmake
+++ b/plugins/rudp/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/sbus/Makefile.nmake b/plugins/sbus/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/sbus/Makefile.nmake
+++ b/plugins/sbus/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index b46c8d66b9e836035c848214b1dc7940613c136c..730388914e72de8f4aa9c3a5ea08ba0c07130f6f 100644 (file)
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -15,7 +15,7 @@ CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 .c.obj::
        $(CC) $(CFLAGS) -Fdstats_tree.pdb -c $<
        
-LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib

diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/v5ua/Makefile.nmake
+++ b/plugins/v5ua/Makefile.nmake
@@ -12,7 +12,7 @@ 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

diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index a27533c563bbed9204d68f7a9455dce20427706f..dbc7d1c4e73469989e695b0f2a4d05313f57f402 100644 (file)
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -12,7 +12,7 @@ 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