Move inet_*.[ch] files to epan.
svn path=/trunk/; revision=2494
This commit is contained in:
Gilbert Ramirez
parent
b3f64359bb
commit
26bda31ed9
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.am
|
||||
# Automake file for Ethereal
|
||||
#
|
||||
# $Id: Makefile.am,v 1.233 2000/10/14 03:53:24 gram Exp $
|
||||
# $Id: Makefile.am,v 1.234 2000/10/14 04:31:24 gram Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -264,8 +264,6 @@ ETHEREAL_COMMON_SOURCES = \
|
|||
etypes.h \
|
||||
follow.c \
|
||||
follow.h \
|
||||
inet_aton.h \
|
||||
inet_v6defs.h \
|
||||
ipproto.c \
|
||||
llcsaps.h \
|
||||
nlpid.h \
|
||||
|
|
@ -315,10 +313,7 @@ EXTRA_ethereal_SOURCES = \
|
|||
strcasecmp.c \
|
||||
strncasecmp.c \
|
||||
mkstemp.c \
|
||||
mkstemp.h \
|
||||
inet_aton.c \
|
||||
inet_pton.c \
|
||||
inet_ntop.c
|
||||
mkstemp.h
|
||||
|
||||
# Optional objects that I know how to build. These will be
|
||||
# linked into the ethereal executable.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||
## Use: nmake -f makefile.nmake
|
||||
#
|
||||
# $Id: Makefile.nmake,v 1.57 2000/10/14 03:53:24 gram Exp $
|
||||
# $Id: Makefile.nmake,v 1.58 2000/10/14 04:31:24 gram Exp $
|
||||
|
||||
include config.nmake
|
||||
|
||||
|
|
@ -188,10 +188,7 @@ tethereal_OBJECTS = \
|
|||
EXTRA_OBJECTS = \
|
||||
snprintf.obj \
|
||||
strerror.obj \
|
||||
mkstemp.obj \
|
||||
inet_aton.obj \
|
||||
inet_pton.obj \
|
||||
inet_ntop.obj
|
||||
mkstemp.obj
|
||||
|
||||
ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \
|
||||
wsock32.lib user32.lib \
|
||||
|
|
|
|||
14
config.nmake
14
config.nmake
|
|
@ -2,17 +2,21 @@
|
|||
GTK_VERSION=1.3
|
||||
GLIB_VERSION=1.3
|
||||
|
||||
GLIB_DIR=T:\w32-ix86\ethereal\glib
|
||||
GTK_DIR=T:\w32-ix86\ethereal\gtk+
|
||||
GLIB_DIR=T:\w32-ix86\glib
|
||||
GTK_DIR=T:\w32-ix86\gtk+
|
||||
|
||||
PCAP_DIR=T:\w32-ix86\ethereal\WPdpack
|
||||
PCAP_DIR=T:\w32-ix86\WPdpack
|
||||
|
||||
LOCAL_CFLAGS=-Zi
|
||||
LOCAL_LDFLAGS=/DEBUG
|
||||
|
||||
PATH=t:\w32-ix86\cygnus\cygwin-b20\H-i586-cygwin32\bin;$(PATH)
|
||||
# Set path if you need to find some binary
|
||||
#PATH=t:\w32-ix86\cygnus\cygwin-b20\H-i586-cygwin32\bin;$(PATH)
|
||||
|
||||
PERL=perl
|
||||
PYTHON=python
|
||||
LEX=flex
|
||||
YACC=bison
|
||||
YACC_OPTS=-S t:\w32-ix86\cygnus\cygwin-b20\share\bison.simple
|
||||
|
||||
# Set YACC_OPTS if cygnus bison can't find template file.
|
||||
#YACC_OPTS=-S t:\w32-ix86\cygnus\cygwin-b20\share\bison.simple
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Automake file for the EPAN library
|
||||
# (Ethereal Protocol ANalyzer Library)
|
||||
#
|
||||
# $Id: Makefile.am,v 1.8 2000/10/14 03:53:25 gram Exp $
|
||||
# $Id: Makefile.am,v 1.9 2000/10/14 04:31:25 gram Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -65,10 +65,15 @@ libethereal_a_SOURCES = \
|
|||
tvbuff.c \
|
||||
tvbuff.h
|
||||
|
||||
EXTRA_libethereal_a_SOURCES = \
|
||||
dfilter-grammar.c \
|
||||
dfilter-grammar.h \
|
||||
dfilter-scanner.c
|
||||
EXTRA_libethereal_a_SOURCES = \
|
||||
dfilter-grammar.c \
|
||||
dfilter-grammar.h \
|
||||
dfilter-scanner.c \
|
||||
inet_aton.c \
|
||||
inet_pton.c \
|
||||
inet_ntop.c \
|
||||
inet_aton.h \
|
||||
inet_v6defs.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
Makefile.nmake
|
||||
|
|
|
|||
|
|
@ -7,6 +7,12 @@ CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../wiretap \
|
|||
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
|
||||
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
|
||||
|
||||
# For use when making ethereal.dll
|
||||
libethereal_LIBS = \
|
||||
wsock32.lib user32.lib \
|
||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
||||
|
||||
{$S}.c{$O}.obj::
|
||||
$(CC) $(CFLAGS) -Fd$O\ -c $<
|
||||
|
||||
|
|
@ -17,6 +23,9 @@ OBJECTS=conversation.obj \
|
|||
epan.obj \
|
||||
except.obj \
|
||||
filesystem.obj \
|
||||
inet_aton.obj \
|
||||
inet_pton.obj \
|
||||
inet_ntop.obj \
|
||||
ipv4.obj \
|
||||
packet.obj \
|
||||
plugins.obj \
|
||||
|
|
@ -25,8 +34,12 @@ OBJECTS=conversation.obj \
|
|||
strutil.obj \
|
||||
tvbuff.obj \
|
||||
|
||||
# For use when making ethereal.dll
|
||||
#ethereal.dll ethereal.lib : ..\config.h $(OBJECTS)
|
||||
# link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS)
|
||||
|
||||
ethereal.lib : ..\config.h $(OBJECTS)
|
||||
lib /out:ethereal.lib $(OBJECTS)
|
||||
lib /out:ethereal.lib $(OBJECTS)
|
||||
|
||||
dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* inet_aton.h
|
||||
*
|
||||
* $Id: inet_aton.h,v 1.2 2000/08/11 13:34:19 deniel Exp $
|
||||
* $Id: inet_aton.h,v 1.1 2000/10/14 04:31:26 gram Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char rcsid[] = "$Id: inet_ntop.c,v 1.4 2000/08/11 13:34:52 deniel Exp $";
|
||||
static char rcsid[] = "$Id: inet_ntop.c,v 1.1 2000/10/14 04:31:26 gram Exp $";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char rcsid[] = "$Id: inet_pton.c,v 1.4 2000/08/11 13:34:52 deniel Exp $";
|
||||
static char rcsid[] = "$Id: inet_pton.c,v 1.1 2000/10/14 04:31:26 gram Exp $";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* inet_v6defs.h
|
||||
*
|
||||
* $Id: inet_v6defs.h,v 1.4 2000/08/11 13:34:19 deniel Exp $
|
||||
* $Id: inet_v6defs.h,v 1.1 2000/10/14 04:31:26 gram Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
Loading…
Reference in New Issue