diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-10-15 16:44:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-10-15 16:44:31 +0000 |
| commit | 4644ce72634f90e866519faf0a06aca2f7adee12 (patch) | |
| tree | b26932af780203d6402c6c7cdb73d06c148aff02 /epan/Makefile.nmake | |
| parent | e23dc22c4c48430a787cc1cda85d50d040573592 (diff) | |
| download | wireshark-4644ce72634f90e866519faf0a06aca2f7adee12.tar.gz | |
Fix Windows maintainer-clean/distclean/clean to recurse thru subdirs only once (instead of worst-case 1+2+3 times)
svn path=/trunk/; revision=23187
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 251c59e4ca..fd8772c1e7 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -97,13 +97,14 @@ libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter $(WS $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake config.h cd epan -clean: +clean-local: rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) \ libwireshark.lib libwireshark.dll libwireshark.dll.manifest libwireshark.exp libwireshark.pdb \ vc60.pdb vc80.pdb doxygen.cfg html/*.* \ exntest.obj exntest.exe reassemble_test.obj reassemble_test.exe tvbtest.obj tvbtest.exe - if exist html rmdir html + +clean: clean-local cd crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../ftypes @@ -125,7 +126,7 @@ clean: # This might not be necessary for "dtd_grammar.{c,h}", but we handle them # the same for now. # -distclean: clean +distclean-local: clean-local rm -f config.h register.c mkstemp.c strptime.c \ inet_ntop.c inet_pton.c \ $(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \ @@ -133,6 +134,8 @@ distclean: clean $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ dtd_grammar.out sminmpec.c + +distclean: distclean-local cd crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../ftypes @@ -145,7 +148,9 @@ distclean: clean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd .. -maintainer-clean: distclean +maintainer-clean-local: distclean-local + +maintainer-clean: maintainer-clean-local cd crypt $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../ftypes |