summaryrefslogtreecommitdiff
path: root/Makefile.config
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-08-10 14:55:41 +0000
committerpaltherr <paltherr@epfl.ch>2004-08-10 14:55:41 +0000
commit1129ed2878176b506fdf2964d7f09ae7345d4346 (patch)
treeb5e41052b27a460a362dfefcd85be1b48249a5ab /Makefile.config
parentc812ada36fa4fe9b9e4faba790727332e8be40f3 (diff)
downloadscala-1129ed2878176b506fdf2964d7f09ae7345d4346.tar.gz
scala-1129ed2878176b506fdf2964d7f09ae7345d4346.tar.bz2
scala-1129ed2878176b506fdf2964d7f09ae7345d4346.zip
- Redesigned the root Makefile, introduced buil...
- Redesigned the root Makefile, introduced build contexts
Diffstat (limited to 'Makefile.config')
-rw-r--r--Makefile.config20
1 files changed, 13 insertions, 7 deletions
diff --git a/Makefile.config b/Makefile.config
index d35b9e4304..6b878d2574 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -19,17 +19,13 @@ PROJECT_DOCUMENTDIR ?= $(PROJECT_ROOT)/doc
PROJECT_LIBRARYDIR ?= $(PROJECT_ROOT)/lib
PROJECT_SUPPORTDIR ?= $(PROJECT_ROOT)/support
PROJECT_SOURCEDIR ?= $(PROJECT_ROOT)/sources
-PROJECT_OUTPUTDIR ?= $(PROJECT_ROOT)/classes
+PROJECT_OBJECTDIR ?= $(PROJECT_ROOT)/objects
PROJECT_WEBSITEDIR ?= $(PROJECT_ROOT)/website
PROJECT_HTDOCSDIR ?= $(PROJECT_WEBSITEDIR)/htdocs
PROJECT_DISTRIBDIR ?= $(PROJECT_ROOT)/distribs
PROJECT_ARCHIVEDIR ?= $(PROJECT_DISTRIBDIR)
-PROJECT_BOOTSTRAPDIR ?= $(PROJECT_ROOT)/bootstrap
-PROJECT_BOOTTESTDIR ?= $(PROJECT_ROOT)/boottest
-PROJECT_CLASSPATH ?= $(PROJECT_OUTPUTDIR)
PROJECT_LISTDIR ?= $(PROJECT_CONFIGDIR)/list
PROJECT_APIDOCDIR ?= $(PROJECT_DOCUMENTDIR)/api
-PROJECT_LATEST_PREFIX ?= .latest-
##############################################################################
# External libraries
@@ -105,9 +101,14 @@ PICO ?= pico
PICO_FLAGS ?= -make -source 1.4
##############################################################################
-# Bootstrap compiler
+# Scala tools
-BOOTSTRAP_SCALAC ?= scalac
+SCALA_HOME ?=
+SCALAC ?= $(SCALA_HOME:%=%/bin/)scalac
+SCALAP ?= $(SCALA_HOME:%=%/bin/)scalap
+SCALAINT ?= $(SCALA_HOME:%=%/bin/)scalaint
+SCALARUN ?= $(SCALA_HOME:%=%/bin/)scalarun
+SCALADOC ?= $(SCALA_HOME:%=%/bin/)scaladoc
##############################################################################
# Convert tool (ImageMagick)
@@ -122,3 +123,8 @@ XSLTPROC ?= xsltproc
XSLTPROC_FLAGS ?=
##############################################################################
+# Latest files
+
+LATEST_PREFIX ?= .latest
+
+##############################################################################