Move the xDLC helper routines into epan.

svn path=/trunk/; revision=12127

Makefile.common

@@ -58,7 +58,6 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	t35.h	\
 	tap.h	\
 	x264_prt_id.h	\
-	xdlc.h	\
 	xmlstub.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.

epan/Makefile.common

@@ -58,7 +58,8 @@ LIBETHEREAL_SRC = 		\
 	timestamp.c		\
 	to_str.c		\
 	tvbuff.c		\
-	value_string.c
+	value_string.c		\
+	xdlc.c
 
 LIBETHEREAL_INCLUDES = 		\
 	addr_and_mask.h		\
@@ -106,7 +107,8 @@ LIBETHEREAL_INCLUDES = 		\
 	timestamp.h    		\
 	to_str.h		\
 	tvbuff.h		\
-	value_string.h
+	value_string.h		\
+	xdlc.h
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =	\
@@ -121,6 +123,5 @@ DISSECTOR_SUPPORT_SRC =	\
 	../req_resp_hdrs.c	\
 	../t35.c	\
 	../tap.c	\
-	../xdlc.c	\
 	../xmlstub.c
 

epan/dissectors/packet-fr.c

@@ -48,7 +48,7 @@
 #include <epan/prefs.h>
 #include "packet-llc.h"
 #include "packet-chdlc.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "oui.h"
 #include "nlpid.h"

epan/dissectors/packet-hpext.c

@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "llcsaps.h"
 #include "packet-hpext.h"

epan/dissectors/packet-lapb.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 static int proto_lapb = -1;
 static int hf_lapb_address = -1;

epan/dissectors/packet-lapd.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 #include "lapd_sapi.h"
 

epan/dissectors/packet-llc.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "oui.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include "etypes.h"
 #include "llcsaps.h"
 #include "bridged_pids.h"

epan/dissectors/packet-sdlc.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 /*
  * See

epan/dissectors/packet-v120.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 static int proto_v120 = -1;
 static int hf_v120_address = -1;

epan/plugins.c

@@ -72,7 +72,7 @@
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 #include "report_err.h"
 #include "plugins/plugin_table.h"

epan/xdlc.c

@@ -32,7 +32,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 
 const value_string ftype_vals[] = {
     { XDLC_I, "Information frame" },

plugins/plugin_api.h

@@ -58,7 +58,7 @@
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 #include "epan/except.h"
 #include "epan/filesystem.h"

plugins/plugin_api_list.c

@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-rtcp.h>
 #include "tap.h"
 #include "asn1.h"
-#include "xdlc.h"
+#include <epan/xdlc.h>
 #include <epan/crc16.h>
 
 gint check_col(column_info*, gint);