aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-09-27 05:18:06 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-09-27 05:18:06 +0000
commitcba2930d6bb7e8cf2b0c03d14203624b56460835 (patch)
tree0f3f194c5a494193939c9fce55e70e0429037f20
parent137fa6c00e19aa941413b73462d26da8e5b6eade (diff)
Move packet.[ch] to epan
svn path=/trunk/; revision=2460
-rw-r--r--Makefile.am8
-rw-r--r--epan/Makefile.am4
-rw-r--r--epan/packet.c (renamed from packet.c)2
-rw-r--r--epan/packet.h (renamed from packet.h)2
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 3339223125..628f09c686 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.228 2000/09/27 04:54:23 gram Exp $
+# $Id: Makefile.am,v 1.229 2000/09/27 05:17:56 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -270,8 +270,6 @@ ETHEREAL_COMMON_SOURCES = \
llcsaps.h \
nlpid.h \
oui.h \
- packet.c \
- packet.h \
ppptypes.h \
prefs.c \
prefs.h \
@@ -432,9 +430,9 @@ editcap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
# The first argument is the directory in which the source files live.
# All subsequent arguments are the files to scan.
#
-register.c: packet.c $(DISSECTOR_SOURCES) $(srcdir)/make-reg-dotc
+register.c: $(srcdir)/epan/packet.c $(DISSECTOR_SOURCES) $(srcdir)/make-reg-dotc
@echo Making register.c
- @$(srcdir)/make-reg-dotc $(srcdir) packet.c $(DISSECTOR_SOURCES)
+ @$(srcdir)/make-reg-dotc $(srcdir) $(srcdir)/epan/packet.c $(DISSECTOR_SOURCES)
ps.c: print.ps rdps
./rdps $(srcdir)/print.ps ps.c
diff --git a/epan/Makefile.am b/epan/Makefile.am
index f7d9c92784..da1e3c9e2a 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am,v 1.2 2000/09/27 05:05:32 gram Exp $
+# $Id: Makefile.am,v 1.3 2000/09/27 05:18:05 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -46,6 +46,8 @@ libepan_a_SOURCES = \
except.c \
except.h \
exception.h \
+ packet.c \
+ packet.h \
pint.h \
plugins.c \
plugins.h \
diff --git a/packet.c b/epan/packet.c
index 29c27e8569..676e0970cf 100644
--- a/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.111 2000/09/27 04:54:29 gram Exp $
+ * $Id: packet.c,v 1.1 2000/09/27 05:18:05 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet.h b/epan/packet.h
index 950ddf9aab..19623772dc 100644
--- a/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.202 2000/09/21 04:41:08 gram Exp $
+ * $Id: packet.h,v 1.1 2000/09/27 05:18:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>