diff options
| author | paltherr <paltherr@epfl.ch> | 2004-07-20 17:03:12 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-07-20 17:03:12 +0000 |
| commit | fbed2284e15cae07889e2319cfb391bba9207448 (patch) | |
| tree | efb6b6bf02a22abed659d615cd1b4d526fe6e61b | |
| parent | 8991585adcacdfef75dc20ea267b6d8be6dc9df4 (diff) | |
| download | scala-fbed2284e15cae07889e2319cfb391bba9207448.tar.gz scala-fbed2284e15cae07889e2319cfb391bba9207448.tar.bz2 scala-fbed2284e15cae07889e2319cfb391bba9207448.zip | |
- Declared fastclean in default.mk
- Moved removal from ~ and core files to default.distclean
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | support/make/default.mk | 12 |
2 files changed, 11 insertions, 8 deletions
@@ -210,7 +210,7 @@ all : servletEngine all : scala4ant all : scalatest -force : fastclean +force : @$(make) all fastclean : @@ -218,13 +218,13 @@ fastclean : @if [ -f .generated ]; then $(call RUN,$(RM) `$(CAT) .generated`); fi $(RM) .generated -clean : fastclean +clean : $(RM) -r $(PROJECT_APIDOCDIR) $(RM) -r $(PROJECT_BOOTTESTDIR) $(RM) -r $(PROJECT_OUTPUTDIR) $(RM) -r $(PROJECT_BOOTSTRAPDIR) -distclean : clean +distclean : $(RM) $(LIBRARY_JAR_ARCHIVE) $(RM) $(TOOLS_JAR_ARCHIVE) $(RM) $(SCRIPTS_WRAPPER_LINKS) @@ -265,7 +265,6 @@ scalatest : .latest-scalatest-jc boottest : .latest-boottest library-doc : .latest-library-sdc -.PHONY : fastclean .PHONY : sources .PHONY : system .PHONY : lamplib diff --git a/support/make/default.mk b/support/make/default.mk index e8a11d1546..a707958d09 100644 --- a/support/make/default.mk +++ b/support/make/default.mk @@ -8,25 +8,29 @@ all : default force : default.force +fastclean : default.fastclean clean : default.clean distclean : default.distclean default : -default.force : +default.force : fastclean -default.clean : - $(RM) core *~ +default.fastclean : -default.distclean : clean +default.clean : fastclean +default.distclean : clean + $(FIND) '(' -name '*~' -o -name core ')' -exec $(RM) '{}' ';' .PHONY : all .PHONY : force +.PHONY : fastclean .PHONY : clean .PHONY : distclean .PHONY : default .PHONY : default.force +.PHONY : default.fastclean .PHONY : default.clean .PHONY : default.distclean |