aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-05-30 19:03:56 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-05-30 19:03:56 +0000
commit9d6d0cf275185710621a711f92c0a635ed6e4bb4 (patch)
treedb337489db5f1b8f015b518717c84d9239270521 /packaging
parent2a7ecea45c45d8cd46dfc94c260e0b3f5e6d256c (diff)
Replace IDL generated dissector with common dll
svn path=/trunk/; revision=42926
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake5
-rw-r--r--packaging/nsis/wireshark.nsi5
2 files changed, 2 insertions, 8 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 6d3f2f8f0a..aa95470179 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -47,10 +47,7 @@ PLUGINS= \
../../plugins/asn1/asn1.dll \
../../plugins/docsis/docsis.dll \
../../plugins/ethercat/ethercat.dll \
- ../../plugins/giop/coseventcomm.dll \
- ../../plugins/giop/cosnaming.dll \
- ../../plugins/giop/parlay.dll \
- ../../plugins/giop/tango.dll \
+ ../../plugins/giop/giop.dll \
../../plugins/gryphon/gryphon.dll \
../../plugins/irda/irda.dll \
../../plugins/m2m/m2m.dll \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 90d99a600c..65f65197a8 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -940,10 +940,7 @@ SetOutPath '$INSTDIR\plugins\${VERSION}'
File "..\..\plugins\asn1\asn1.dll"
File "..\..\plugins\docsis\docsis.dll"
File "..\..\plugins\ethercat\ethercat.dll"
-File "..\..\plugins\giop\coseventcomm.dll"
-File "..\..\plugins\giop\cosnaming.dll"
-File "..\..\plugins\giop\parlay.dll"
-File "..\..\plugins\giop\tango.dll"
+File "..\..\plugins\giop\giop.dll"
File "..\..\plugins\gryphon\gryphon.dll"
File "..\..\plugins\irda\irda.dll"
File "..\..\plugins\m2m\m2m.dll"