aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-07-27 18:56:50 +0000
committerGuy Harris <guy@alum.mit.edu>2004-07-27 18:56:50 +0000
commit74fda1d8ab2af288ab526ffb3e3ea954872cbb6e (patch)
tree11ca1304706ea08c0f51eead54f85c35b596262f /epan/Makefile.nmake
parent65766e4fcbdb1955f7588ef4d871025ff6a404f8 (diff)
From Lars Roland:
clean up the message printed when building libethereal.dll; have "make distclean" clean out the "dissectors" subdirectory. Clean up indentation. svn path=/trunk/; revision=11540
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 48ce33a31a..826e6773ce 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -83,7 +83,7 @@ DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissectors $(DISSECTOR_SUPPORT_OBJECTS) doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
- echo libethereal.dll
+ @echo Linking libethereal.dll
$(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) \
/DEF:libethereal.def /OUT:libethereal.dll \
@@ -101,7 +101,7 @@ ethereal.lib : ..\config.h $(OBJECTS)
clean:
rm -f $(OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS:../=) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
- if exist html rmdir html
+ if exist html rmdir html
cd ftypes
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../dfilter
@@ -116,6 +116,8 @@ distclean: clean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../dfilter
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+ cd ../dissectors
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ..
ftypes:: ..\config.h