diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-03-14 21:53:16 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-03-14 21:53:16 +0000 |
| commit | 7519d12f8f4bd087351d1f8796e1dc696b629770 (patch) | |
| tree | 33c6b3c717025b517a1482a0e81a796613c36dc1 | |
| parent | 74178fafda524972bb99e5a9f32a0262a4530f52 (diff) | |
Make sure the Infiniband plugin is properly built and packaged.
svn path=/trunk/; revision=24634
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | epan/Makefile.am | 1 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 42818ffc2a..187a46f17b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -962,6 +962,7 @@ install-common-files: xcopy ".\plugins\giop\parlay.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy ".\plugins\giop\tango.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy ".\plugins\gryphon\gryphon.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy ".\plugins\infiniband\infiniband.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy ".\plugins\irda\irda.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy ".\plugins\lwres\lwres.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d xcopy ".\plugins\m2m\m2m.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d diff --git a/epan/Makefile.am b/epan/Makefile.am index cd8d09fa9c..8e274de71a 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -212,6 +212,7 @@ plugin_src = \ ../plugins/giop/packet-cosnaming.c \ ../plugins/giop/packet-coseventcomm.c \ ../plugins/gryphon/packet-gryphon.c \ + ../plugins/infiniband/packet-infiniband.c \ ../plugins/irda/packet-irda.c \ ../plugins/lwres/packet-lwres.c \ ../plugins/m2m/packet-m2m.c \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index e00ac3fb98..d0c8310e2d 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -80,6 +80,7 @@ PLUGINS= \ ../../plugins/giop/parlay.dll \ ../../plugins/giop/tango.dll \ ../../plugins/gryphon/gryphon.dll \ + ../../plugins/infiniband/infiniband.dll \ ../../plugins/irda/irda.dll \ ../../plugins/lwres/lwres.dll \ ../../plugins/m2m/m2m.dll \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 444079da67..2116f54db6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -785,6 +785,7 @@ File "..\..\plugins\giop\cosnaming.dll" File "..\..\plugins\giop\parlay.dll" File "..\..\plugins\giop\tango.dll" File "..\..\plugins\gryphon\gryphon.dll" +File "..\..\plugins\infiniband\infiniband.dll" File "..\..\plugins\irda\irda.dll" File "..\..\plugins\lwres\lwres.dll" File "..\..\plugins\m2m\m2m.dll" diff --git a/plugins/Makefile.am b/plugins/Makefile.am index a1acbe35c0..6c13eeda1a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -31,8 +31,8 @@ SUBDIRS = \ ethercat \ giop \ gryphon \ - irda \ infiniband \ + irda \ lwres \ m2m \ mate \ |