diff options
author | Gerald Combs <gerald@wireshark.org> | 2006-08-04 14:43:48 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2006-08-04 14:43:48 +0000 |
commit | 4cd1774c6939d4139eeddd1fcb75f4d5e04bbd26 (patch) | |
tree | e14766b8c0050e632cb5af681291cae6c6e9afe7 /epan/Makefile.nmake | |
parent | 616a6a1509387455c1e390944db271263ca6d986 (diff) |
ethereal -> wireshark.
svn path=/trunk/; revision=18836
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r-- | epan/Makefile.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 2798ce5e0b..3f77558732 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -51,7 +51,7 @@ DOXYGEN_DEP=doxygen !IFDEF ENABLE_LIBWIRESHARK all: ftypes dfilter dissectors libwireshark.dll !ELSE -all: ftypes dfilter dissectors ethereal.lib +all: ftypes dfilter dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll @@ -69,9 +69,9 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes df dissectors\register.obj \ $(EXTRA_OBJECTS) -ethereal.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib - link /lib /out:ethereal.lib $(LIBWIRESHARK_OBJECTS) \ + link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) ..\config.h : ..\config.h.win32 ..\config.nmake @@ -80,7 +80,7 @@ ethereal.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(D cd epan clean: - rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libwireshark.dll libwireshark.lib libwireshark.exp $(PDB_FILE) doxygen.cfg html/*.* + rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) libwireshark.lib libwireshark.dll libwireshark.lib libwireshark.exp $(PDB_FILE) doxygen.cfg html/*.* if exist html rmdir html cd ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean |