diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-10-11 07:35:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-10-11 07:35:02 +0000 |
| commit | faf70584f2eaa0cafb8f40a411bcbfc61264ffca (patch) | |
| tree | aecc3ed74fa0c03d46b0b72f5369bb6c9787c799 /epan | |
| parent | 54ecbe2d4e4d1eaf2d1e8ae0789d4378f3b9c874 (diff) | |
| download | wireshark-faf70584f2eaa0cafb8f40a411bcbfc61264ffca.tar.gz | |
Fix it to build on Windows.
svn path=/trunk/; revision=2488
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.am | 6 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 43 | ||||
| -rw-r--r-- | epan/filesystem.c | 4 |
3 files changed, 50 insertions, 3 deletions
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) |