ceph/wireshark/wireshark.patch

95 lines
3.2 KiB
Diff
Raw Normal View History

2008-11-25 18:57:37 +00:00
Index: configure.in
===================================================================
--- configure.in (revision 29691)
2008-11-25 18:57:37 +00:00
+++ configure.in (working copy)
@@ -1742,6 +1742,7 @@
packaging/svr4/pkginfo
plugins/Makefile
2008-11-25 18:57:37 +00:00
plugins/asn1/Makefile
+ plugins/ceph/Makefile
plugins/docsis/Makefile
plugins/ethercat/Makefile
plugins/giop/Makefile
2008-11-25 18:57:37 +00:00
Index: Makefile.am
===================================================================
--- Makefile.am (revision 29691)
2008-11-25 18:57:37 +00:00
+++ Makefile.am (working copy)
@@ -264,6 +264,7 @@
-include plugins/Custom.make
plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
2008-11-25 18:57:37 +00:00
-dlopen plugins/asn1/asn1.la \
+ -dlopen plugins/ceph/ceph.la \
-dlopen plugins/docsis/docsis.la \
-dlopen plugins/ethercat/ethercat.la \
-dlopen plugins/giop/cosnaming.la \
2008-11-27 01:16:43 +00:00
Index: plugins/Makefile.nmake
===================================================================
--- plugins/Makefile.nmake (revision 29691)
2008-11-27 01:16:43 +00:00
+++ plugins/Makefile.nmake (working copy)
@@ -33,6 +33,9 @@
2008-11-27 01:16:43 +00:00
cd asn1
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
cd ..
+ cd ceph
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
+ cd ..
cd docsis
2008-11-27 01:16:43 +00:00
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
cd ..
@@ -86,6 +89,7 @@
!IFDEF ENABLE_LIBWIRESHARK
cd..
xcopy plugins\asn1\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
+ xcopy plugins\ceph\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy plugins\docsis\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy plugins\ethercat\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
xcopy plugins\giop\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
2008-11-25 18:57:37 +00:00
Index: plugins/Makefile.am
===================================================================
--- plugins/Makefile.am (revision 29691)
2008-11-25 18:57:37 +00:00
+++ plugins/Makefile.am (working copy)
@@ -24,6 +24,7 @@
-include Custom.make
SUBDIRS = $(_CUSTOM_SUBDIRS_) \
2008-11-25 18:57:37 +00:00
asn1 \
+ ceph \
docsis \
ethercat \
giop \
2008-11-25 18:57:37 +00:00
Index: epan/Makefile.am
===================================================================
--- epan/Makefile.am (revision 29691)
2008-11-25 18:57:37 +00:00
+++ epan/Makefile.am (working copy)
@@ -201,6 +201,7 @@
-include ../plugins/Custom.make
2008-11-25 18:57:37 +00:00
plugin_src = \
../plugins/asn1/packet-asn1.c \
+ ../plugins/ceph/packet-ceph.c \
../plugins/docsis/packet-bintrngreq.c \
2008-11-25 18:57:37 +00:00
../plugins/docsis/packet-bpkmattr.c \
../plugins/docsis/packet-bpkmreq.c \
Index: packaging/nsis/Makefile.nmake
===================================================================
--- packaging/nsis/Makefile.nmake (revision 29691)
2008-11-25 18:57:37 +00:00
+++ packaging/nsis/Makefile.nmake (working copy)
@@ -44,6 +44,7 @@
PLUGINS= \
2008-11-25 18:57:37 +00:00
../../plugins/asn1/asn1.dll \
+ ../../plugins/ceph/ceph.dll \
../../plugins/docsis/docsis.dll \
../../plugins/ethercat/ethercat.dll \
../../plugins/giop/coseventcomm.dll \
2008-11-25 18:57:37 +00:00
Index: packaging/nsis/wireshark.nsi
===================================================================
--- packaging/nsis/wireshark.nsi (revision 29691)
2008-11-25 18:57:37 +00:00
+++ packaging/nsis/wireshark.nsi (working copy)
@@ -875,6 +875,7 @@
;-------------------------------------------
SetOutPath '$INSTDIR\plugins\${VERSION}'
2008-11-25 18:57:37 +00:00
File "..\..\plugins\asn1\asn1.dll"
+File "..\..\plugins\ceph\ceph.dll"
File "..\..\plugins\docsis\docsis.dll"
File "..\..\plugins\ethercat\ethercat.dll"
File "..\..\plugins\giop\coseventcomm.dll"