Move h225-persistentdata.[ch] to epan,

as its code is linked into libethereal.dll.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13354 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index 11fbef7db16cbda679cc56671774143ee8ad2142..4adc7dfa7aba7406f7caa9693c7027dc517b4b4b 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -35,7 +35,6 @@ DISSECTOR_SUPPORT_INCLUDES =  \
        follow.h        \
        format-oid.h    \
        greproto.h      \
-       h225-persistentdata.h   \
        iax2_codec_type.h       \
        ip_opts.h       \
        isprint.h       \

diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 993eeddfa31c545de5ac25808be829415eba9ebf..269efea3adc98e44fce3316e02967e4fbedb9781 100644 (file)
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -49,7 +49,7 @@
 #include "packet-per.h"
 #include "packet-h225.h"
 #include <epan/t35.h>
-#include "h225-persistentdata.h"
+#include <epan/h225-persistentdata.h>
 #include "packet-ber.h"
 #include "packet-h235.h"
 #include "packet-h245.h"

diff --git a/epan/Makefile.common b/epan/Makefile.common
index 88244e1ad349cba7615ae10242b4aa8045be2719..f6d7e225266437a622335477aca11cbb07189d29 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -46,6 +46,7 @@ LIBETHEREAL_SRC =             \
        except.c                \
        filesystem.c            \
        frame_data.c            \
+       h225-persistentdata.c   \
        in_cksum.c              \
        ipproto.c               \
        ipv4.c                  \
@@ -99,6 +100,7 @@ LIBETHEREAL_INCLUDES =               \
        filesystem.h            \
        frame_data.h            \
        gdebug.h                \
+       h225-persistentdata.h   \
        in_cksum.h              \
        ipproto.h               \
        ipv4.h                  \
@@ -134,7 +136,6 @@ LIBETHEREAL_INCLUDES =              \
 DISSECTOR_SUPPORT_SRC =        \
        ../asn1.c       \
        ../follow.c     \
-       ../h225-persistentdata.c        \
        ../ptvcursor.c  \
        ../reassemble.c \
        ../xmlstub.c

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 169bdc6e0e729f83838ce1f5456ac5f8d83a5d56..8da617f4b63186f372d1fed7fc00718ee6eee82a 100644 (file)
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -56,7 +56,7 @@
 #include "packet-per.h"
 #include "packet-h225.h"
 #include <epan/t35.h>
-#include "h225-persistentdata.h"
+#include <epan/h225-persistentdata.h>
 #include "packet-ber.h"
 #include "packet-h235.h"
 #include "packet-h245.h"

diff --git a/h225-persistentdata.c b/epan/h225-persistentdata.c
similarity index 100%
rename from h225-persistentdata.c
rename to epan/h225-persistentdata.c

diff --git a/h225-persistentdata.h b/epan/h225-persistentdata.h
similarity index 100%
rename from h225-persistentdata.h
rename to epan/h225-persistentdata.h