summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-08-07 09:15:47 +0000
committerpaltherr <paltherr@epfl.ch>2003-08-07 09:15:47 +0000
commitf0398407c7f1de9434f3570f7480c7b1d7189e2f (patch)
treebaa8ce3552e0a53eb9fa5c0c335ed3be374ae459
parent36a3ab03efe5aff8cb2837f918242e478cf1d980 (diff)
downloadscala-f0398407c7f1de9434f3570f7480c7b1d7189e2f.tar.gz
scala-f0398407c7f1de9434f3570f7480c7b1d7189e2f.tar.bz2
scala-f0398407c7f1de9434f3570f7480c7b1d7189e2f.zip
- Simplified handling of PROJECT_OUTPUTDIR
-rw-r--r--Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 777a438edf..d8e7bc513d 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,6 @@ JC_CLASSPATH = $(PROJECT_CLASSPATH)
# Commands
-all : $(PROJECT_OUTPUTDIR)
all : scripts
all : lamplib
all : meta
@@ -139,13 +138,12 @@ fastclean :
$(RM) .latest-lamplib
clean : fastclean
- $(RM) -r $(PROJECT_OUTPUTDIR)/*
+ $(RM) -r $(PROJECT_OUTPUTDIR)
distclean : clean
$(RM) .latest-*
$(RM) $(SCRIPTS_WRAPPER_LINKS)
$(RM) $(SCRIPTS_WRAPPER)
- $(RM) -r $(PROJECT_OUTPUTDIR)
$(RM) $(PROJECT_JAR_ARCHIVE)
$(RM) $(ROOT)/support/latex/*.class
@@ -217,12 +215,6 @@ library : .latest-library
##############################################################################
# Rules
-$(PROJECT_OUTPUTDIR) :
- $(MKDIR) -p $(dir $(PROJECT_OUTPUTDIR))
- $(if $(PROJECT_OUTPUTDIR_LINK),\
- $(LN) -s $(PROJECT_OUTPUTDIR_LINK) $(PROJECT_OUTPUTDIR),\
- $(MKDIR) $(PROJECT_OUTPUTDIR))
-
$(SCRIPTS_WRAPPER) : INSTALL_PREFIX ?= $(PROJECT_ROOT)
$(SCRIPTS_WRAPPER) : MACRO_VERSION ?= development version
$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR)