← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ceph/quantal

« back to all changes in this revision

Viewing changes to wireshark/wireshark.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-07-16 09:56:24 UTC
  • mfrom: (0.3.11)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: package-import@ubuntu.com-20120716095624-azr2w4hbhei1rxmx
Tags: upstream-0.48
Import upstream version 0.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
wireshark/wireshark.patch
 
1
Index: configure.in
 
2
===================================================================
 
3
--- configure.in        (revision 29691)
 
4
+++ configure.in        (working copy)
 
5
@@ -1742,6 +1742,7 @@
 
6
   packaging/svr4/pkginfo
 
7
   plugins/Makefile
 
8
   plugins/asn1/Makefile
 
9
+  plugins/ceph/Makefile
 
10
   plugins/docsis/Makefile
 
11
   plugins/ethercat/Makefile
 
12
   plugins/giop/Makefile
 
13
Index: Makefile.am
 
14
===================================================================
 
15
--- Makefile.am (revision 29691)
 
16
+++ Makefile.am (working copy)
 
17
@@ -264,6 +264,7 @@
 
18
 -include plugins/Custom.make
 
19
 plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 
20
        -dlopen plugins/asn1/asn1.la \
 
21
+       -dlopen plugins/ceph/ceph.la \
 
22
        -dlopen plugins/docsis/docsis.la \
 
23
        -dlopen plugins/ethercat/ethercat.la \
 
24
        -dlopen plugins/giop/cosnaming.la \
 
25
Index: plugins/Makefile.nmake
 
26
===================================================================
 
27
--- plugins/Makefile.nmake      (revision 29691)
 
28
+++ plugins/Makefile.nmake      (working copy)
 
29
@@ -33,6 +33,9 @@
 
30
        cd asn1
 
31
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
 
32
        cd ..
 
33
+       cd ceph
 
34
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
 
35
+       cd ..
 
36
        cd docsis
 
37
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
 
38
        cd ..
 
39
@@ -86,6 +89,7 @@
 
40
 !IFDEF ENABLE_LIBWIRESHARK
 
41
        cd..
 
42
        xcopy plugins\asn1\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 
43
+       xcopy plugins\ceph\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 
44
        xcopy plugins\docsis\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 
45
        xcopy plugins\ethercat\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 
46
        xcopy plugins\giop\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 
47
Index: plugins/Makefile.am
 
48
===================================================================
 
49
--- plugins/Makefile.am (revision 29691)
 
50
+++ plugins/Makefile.am (working copy)
 
51
@@ -24,6 +24,7 @@
 
52
 -include Custom.make
 
53
 SUBDIRS = $(_CUSTOM_SUBDIRS_) \
 
54
        asn1 \
 
55
+       ceph \
 
56
        docsis \
 
57
        ethercat \
 
58
        giop \
 
59
Index: epan/Makefile.am
 
60
===================================================================
 
61
--- epan/Makefile.am    (revision 29691)
 
62
+++ epan/Makefile.am    (working copy)
 
63
@@ -201,6 +201,7 @@
 
64
 -include ../plugins/Custom.make
 
65
 plugin_src = \
 
66
        ../plugins/asn1/packet-asn1.c \
 
67
+       ../plugins/ceph/packet-ceph.c \
 
68
        ../plugins/docsis/packet-bintrngreq.c \
 
69
        ../plugins/docsis/packet-bpkmattr.c \
 
70
        ../plugins/docsis/packet-bpkmreq.c \
 
71
Index: packaging/nsis/Makefile.nmake
 
72
===================================================================
 
73
--- packaging/nsis/Makefile.nmake       (revision 29691)
 
74
+++ packaging/nsis/Makefile.nmake       (working copy)
 
75
@@ -44,6 +44,7 @@
 
76
 
 
77
 PLUGINS= \
 
78
        ../../plugins/asn1/asn1.dll \
 
79
+       ../../plugins/ceph/ceph.dll \
 
80
        ../../plugins/docsis/docsis.dll \
 
81
        ../../plugins/ethercat/ethercat.dll \
 
82
        ../../plugins/giop/coseventcomm.dll \
 
83
Index: packaging/nsis/wireshark.nsi
 
84
===================================================================
 
85
--- packaging/nsis/wireshark.nsi        (revision 29691)
 
86
+++ packaging/nsis/wireshark.nsi        (working copy)
 
87
@@ -875,6 +875,7 @@
 
88
 ;-------------------------------------------
 
89
 SetOutPath '$INSTDIR\plugins\${VERSION}'
 
90
 File "..\..\plugins\asn1\asn1.dll"
 
91
+File "..\..\plugins\ceph\ceph.dll"
 
92
 File "..\..\plugins\docsis\docsis.dll"
 
93
 File "..\..\plugins\ethercat\ethercat.dll"
 
94
 File "..\..\plugins\giop\coseventcomm.dll"