diff options
| -rw-r--r-- | Makefile.nmake | 46 | ||||
| -rw-r--r-- | epan/Makefile.am | 6 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 43 | ||||
| -rw-r--r-- | epan/filesystem.c | 4 | ||||
| -rw-r--r-- | gtk/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/Makefile.nmake | 4 | ||||
| -rw-r--r-- | plugins/gryphon/Makefile.nmake | 4 | ||||
| -rw-r--r-- | util.c | 4 | ||||
| -rw-r--r-- | util.h | 9 |
9 files changed, 84 insertions, 38 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4b9789963b..4d10b8c424 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: nmake -f makefile.nmake # -# $Id: Makefile.nmake,v 1.54 2000/09/11 16:16:01 gram Exp $ +# $Id: Makefile.nmake,v 1.55 2000/10/11 07:35:00 guy Exp $ include config.nmake @@ -13,7 +13,7 @@ LINK= link LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) CFLAGS=/MT -DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \ - /I$(GTK_DIR) /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(GTK_DIR) /Iepan /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)/include {$S}.c{$O}.obj:: @@ -31,6 +31,7 @@ DISSECTOR_SOURCES = \ packet-bootp.c \ packet-bootparams.c \ packet-bpdu.c \ + packet-bxxp.c \ packet-cdp.c \ packet-cgmp.c \ packet-clip.c \ @@ -45,6 +46,7 @@ DISSECTOR_SOURCES = \ packet-eth.c \ packet-ethertype.c \ packet-fddi.c \ + packet-frame.c \ packet-ftp.c \ packet-giop.c \ packet-gre.c \ @@ -123,6 +125,7 @@ DISSECTOR_SOURCES = \ packet-smb-logon.c \ packet-smb-mailslot.c \ packet-smb-pipe.c \ + packet-smtp.c \ packet-sna.c \ packet-snmp.c \ packet-socks.c \ @@ -159,26 +162,14 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SOURCES:.c=.obj) ETHEREAL_COMMON_OBJECTS = \ asn1.obj \ column.obj \ - conversation.obj \ - dfilter-grammar.obj \ - dfilter-scanner.obj \ - dfilter.obj \ - except.obj \ follow.obj \ getopt.obj \ ipproto.obj \ - ipv4.obj \ - packet.obj \ - plugins.obj \ prefs.obj \ print.obj \ - proto.obj \ ps.obj \ ptvcursor.obj \ register.obj \ - resolv.obj \ - strutil.obj \ - tvbuff.obj \ util.obj \ xdlc.obj \ @@ -202,14 +193,16 @@ EXTRA_OBJECTS = \ inet_pton.obj \ inet_ntop.obj -ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib wsock32.lib user32.lib \ +ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\libepan.lib \ + wsock32.lib user32.lib \ $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib \ $(PCAP_DIR)\lib\libpcap.lib -tethereal_LIBS= wiretap\libwtap.lib wsock32.lib user32.lib \ +tethereal_LIBS= wiretap\libwtap.lib epan\libepan.lib \ + wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib \ $(PCAP_DIR)\lib\libpcap.lib @@ -222,7 +215,7 @@ EXECUTABLES=ethereal.exe tethereal.exe editcap.exe RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res -all: wiretap gtk $(EXECUTABLES) $(RESOURCES) +all: wiretap gtk epan $(EXECUTABLES) $(RESOURCES) ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\libwtap.lib gtk\libui.lib plugins @echo Linking $@ @@ -251,17 +244,9 @@ ps.c : rdps.exe print.ps packet-ncp2222.c : ncp2222.py $(PYTHON) ncp2222.py > packet-ncp2222.c -dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h - -dfilter-scanner.c : dfilter-scanner.l - $(LEX) -Pdfilter_ -odfilter-scanner.c dfilter-scanner.l - -dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y - $(YACC) $(YACC_OPTS) -d -p dfilter_ dfilter-grammar.y -o dfilter-grammar.c - -register.c: packet.c $(DISSECTOR_SOURCES) +register.c: $(DISSECTOR_SOURCES) @echo Making register.c - @sh make-reg-dotc . packet.c $(DISSECTOR_SOURCES) + @sh make-reg-dotc . $(DISSECTOR_SOURCES) clean: rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \ @@ -271,6 +256,8 @@ clean: nmake -f Makefile.nmake clean cd ../gtk nmake -f Makefile.nmake clean + cd ../epan + nmake -f Makefile.nmake clean cd ../plugins nmake -f Makefile.nmake clean cd .. @@ -285,6 +272,11 @@ gtk:: nmake -f Makefile.nmake cd .. +epan:: + cd epan + nmake -f Makefile.nmake + cd .. + plugins:: cd plugins nmake -f Makefile.nmake diff --git a/epan/Makefile.am b/epan/Makefile.am index 9dca8e0839..911302cf16 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.6 2000/09/28 03:52:12 gram Exp $ +# $Id: Makefile.am,v 1.7 2000/10/11 07:35:01 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -70,6 +70,9 @@ EXTRA_libepan_a_SOURCES = \ dfilter-grammar.h \ dfilter-scanner.c +EXTRA_DIST = \ + Makefile.nmake + CLEANFILES = \ libepan.a \ *~ @@ -79,4 +82,3 @@ dfilter-scanner.c : dfilter-scanner.l tvbtest: tvbtest.o tvbuff.o except.o strutil.o $(LINK) -o tvbtest tvbtest.o tvbuff.o except.o strutil.o `glib-config --libs` - diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake new file mode 100644 index 0000000000..b2228468fe --- /dev/null +++ b/epan/Makefile.nmake @@ -0,0 +1,43 @@ +include ..\config.nmake + +############### no need to modify below this line ######### + +CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../wiretap \ + /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ + /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) + +{$S}.c{$O}.obj:: + $(CC) $(CFLAGS) -Fd$O\ -c $< + +OBJECTS=conversation.obj \ + dfilter-grammar.obj \ + dfilter-scanner.obj \ + dfilter.obj \ + epan.obj \ + except.obj \ + filesystem.obj \ + ipv4.obj \ + packet.obj \ + plugins.obj \ + proto.obj \ + resolv.obj \ + strutil.obj \ + tvbuff.obj \ + +libepan.lib : ..\config.h $(OBJECTS) + lib /out:libepan.lib $(OBJECTS) + +dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h + +dfilter-scanner.c : dfilter-scanner.l + $(LEX) -Pdfilter_ -odfilter-scanner.c dfilter-scanner.l + +dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y + $(YACC) $(YACC_OPTS) -d -p dfilter_ dfilter-grammar.y -o dfilter-grammar.c + +..\config.h : ..\config.h.win32 + copy ..\config.h.win32 ..\config.h + +clean: + rm -f $(OBJECTS) libepan.lib diff --git a/epan/filesystem.c b/epan/filesystem.c index bd89677f90..54dc8ffe48 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1,7 +1,7 @@ /* filesystem.c * Filesystem utility routines * - * $Id: filesystem.c,v 1.1 2000/09/28 03:16:16 gram Exp $ + * $Id: filesystem.c,v 1.2 2000/10/11 07:35:01 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -28,6 +28,7 @@ #endif #include <stdlib.h> +#include <string.h> #include <glib.h> #ifdef HAVE_UNISTD_H @@ -39,6 +40,7 @@ #endif #include "filesystem.h" +#include "util.h" const char* get_home_dir(void) diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 9e6617e2e1..939b8589b6 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -2,7 +2,7 @@ include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I.. /I../wiretap \ +CFLAGS=/MT /DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index c1f8d6d622..73bddaa39e 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -1,12 +1,12 @@ # -# $Id: Makefile.nmake,v 1.6 2000/05/20 20:52:27 guy Exp $ +# $Id: Makefile.nmake,v 1.7 2000/10/11 07:35:02 guy Exp $ # include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \ +CFLAGS=/DHAVE_CONFIG_H /I.. /I../epan /I../wiretap /I. \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index 0e9f3a758f..05a414fe09 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -1,12 +1,12 @@ # -# $Id: Makefile.nmake,v 1.4 2000/04/12 21:51:53 gram Exp $ +# $Id: Makefile.nmake,v 1.5 2000/10/11 07:35:02 guy Exp $ # include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I../.. /I../wiretap \ +CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) @@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.46 2000/09/28 03:16:06 gram Exp $ + * $Id: util.c,v 1.47 2000/10/11 07:35:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -137,7 +137,7 @@ test_for_directory(const char *path) * character in the pathname, or NULL if the pathname contains no * separators. */ -static char * +char * find_last_pathname_separator(char *path) { char *separator; @@ -1,7 +1,7 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.21 2000/09/10 06:44:39 guy Exp $ + * $Id: util.h,v 1.22 2000/10/11 07:35:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -44,6 +44,13 @@ extern "C" { int test_for_directory(const char *); /* + * Given a pathname, return a pointer to the last pathname separator + * character in the pathname, or NULL if the pathname contains no + * separators. + */ +char *find_last_pathname_separator(char *); + +/* * Given a pathname, return the last component. */ char *get_basename(char *); |