aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-02 18:57:35 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-02 18:57:35 +0000
commitbaaa592e08fd7496790986d0d96ec89938e5f9f2 (patch)
treedf069aabd4186cdc53e23776144940b676982bad /plugins
parent6ce8cfc7c8e76852dfc5ad521187079742bbc6b9 (diff)
Disable manifest building for our DLLs. This attempts to fix bug 3272.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27579 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
-rw-r--r--plugins/asn1/Makefile.nmake3
-rw-r--r--plugins/docsis/Makefile.nmake3
-rw-r--r--plugins/easy_codec/Makefile.nmake3
-rw-r--r--plugins/ethercat/Makefile.nmake3
-rw-r--r--plugins/giop/Makefile.nmake14
-rw-r--r--plugins/gryphon/Makefile.nmake3
-rw-r--r--plugins/irda/Makefile.nmake3
-rw-r--r--plugins/m2m/Makefile.nmake3
-rw-r--r--plugins/mate/Makefile.nmake3
-rw-r--r--plugins/opcua/Makefile.nmake3
-rw-r--r--plugins/profinet/Makefile.nmake3
-rw-r--r--plugins/sercosiii/Makefile.nmake3
-rw-r--r--plugins/stats_tree/Makefile.nmake3
-rw-r--r--plugins/tpg/Makefile.nmake3
-rw-r--r--plugins/unistim/Makefile.nmake3
-rw-r--r--plugins/wimax/Makefile.nmake3
-rw-r--r--plugins/wimaxasncp/Makefile.nmake3
17 files changed, 1 insertions, 61 deletions
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index cc7beb49e4..6bdc36773d 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 56c0c86515..3d04e32b34 100644
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -49,9 +49,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(CODEC_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
easy_codec_plugin.obj : easy_codec_plugin.c
$(CC) $(CFLAGS) -Fd$(PLUGIN_NAME).pdb -c easy_codec_plugin.c
diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index fb5ff41150..810e87397e 100644
--- a/plugins/ethercat/Makefile.nmake
+++ b/plugins/ethercat/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) $(DISSECTOR_INCLUDES)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index f4f6e30ebf..13eaf65a6a 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -9,7 +9,7 @@ include ..\..\config.nmake
CFLAGS=/DHAVE_CONFIG_H /I../.. $(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
@@ -22,30 +22,18 @@ all : cosnaming.dll coseventcomm.dll tango.dll parlay.dll
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)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "cosnaming.dll.manifest" -outputresource:cosnaming.dll;2
-!ENDIF
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)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "coseventcomm.dll.manifest" -outputresource:coseventcomm.dll;2
-!ENDIF
tango.dll tango.exp tango.lib : packet-tango.obj $(LINK_PLUGIN_WITH)
link -dll /out:tango.dll $(LDFLAGS) packet-tango.obj $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "tango.dll.manifest" -outputresource:tango.dll;2
-!ENDIF
parlay.dll parlay.exp parlay.lib : packet-parlay.obj $(LINK_PLUGIN_WITH)
link -dll /out:parlay.dll $(LDFLAGS) packet-parlay.obj $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "parlay.dll.manifest" -outputresource:parlay.dll;2
-!ENDIF
!ENDIF
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index 6801cf07ea..ee662b26ab 100644
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 9e0e98e1fa..fdce120155 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -48,9 +48,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/sercosiii/Makefile.nmake
+++ b/plugins/sercosiii/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index 4d4e0ce711..89fc5c9376 100644
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -42,9 +42,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
!ENDIF
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 45ceeb0017..d9112f14e3 100644
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -32,9 +32,6 @@ OBJECTS=packet-mate.obj\
mate.dll mate.exp mate.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
link -dll /out:mate.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "mate.dll.manifest" -outputresource:mate.dll;2
-!ENDIF
!ENDIF
diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index acc863edc3..3cf4dc5b3e 100644
--- a/plugins/unistim/Makefile.nmake
+++ b/plugins/unistim/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index 1e81fc2474..37220cbb5c 100644
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -44,9 +44,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 2398309a6f..dc3f07e5f6 100644
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -45,9 +45,6 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
#
# Build plugin.c, which contains the plugin version[] string, a
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 12:26:38 +0000