The Win32 port of libpcap requires that programs with which it's built

be built as multi-threaded programs; add "/MT" to the list of compiler
flags.

Add "clean" rules in subdirectories, and run subdirectory "nmake -f
Makefile.nmake clean" when "nmake -f Makefile.nmake clean" is done in
the top-level directory, so that "nmake -f Makefile.nmake clean" cleans
everything up.

svn path=/trunk/; revision=1791

diff --git a/Makefile.nmake b/Makefile.nmake
index 25946b30bccf6660298503c082bc45b20fd53a93..e9c658b443fc506a1586697edff02209c92eb452 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -11,7 +11,7 @@ LINK= link
 LDFLAGS = /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /MACHINE:I386 \
        $(LOCAL_LDFLAGS) /OUT:ethereal.exe
 
-CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
+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$(PCAP_DIR)/include
 
@@ -197,6 +197,13 @@ dfilter-grammar.c dfilter-grammer.h : dfilter-grammar.y
 
 clean:
        rm -f $(ethereal_OBJECTS) $(EXTRA_ethereal_OBJECTS) ethereal.exe
+       cd wiretap
+       nmake -f Makefile.nmake clean
+       cd ../gtk
+       nmake -f Makefile.nmake clean
+       cd ../plugins
+       nmake -f Makefile.nmake clean
+       cd ..
 
 wiretap::
        cd wiretap

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 7848b23033183b5e81fb6b8ae2ba17f607a0c366..68ccef75bac2c3bfa9a0cadf2710942320f58672 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -2,7 +2,7 @@ include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap \
+CFLAGS=/MT /DHAVE_CONFIG_H /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)
@@ -41,3 +41,6 @@ libui.lib     : ..\config.h $(OBJECTS)
 
 ..\config.h    : ..\config.h.win32
        copy ..\config.h.win32 ..\config.h
+
+clean:
+       rm -f $(OBJECTS) libui.lib

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 539e5db8d646d487cac1bb374b95787b90ed3e16..9d6dc81a8c9c4fa17b1f3e87d513787498f64dc7 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -3,7 +3,7 @@ include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
+CFLAGS=/MT /DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
 
 OBJECTS=ascend-grammar.obj \
        ascend-scanner.obj \
@@ -39,3 +39,5 @@ ascend-scanner.c : ascend-scanner.l
 config.h       : config.h.win32
        copy config.h.win32 $@
 
+clean :
+       rm -f $(OBJECTS) libwtap.lib