Makefile-based build system disapears.

9 files changed, 0 insertions, 1828 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5316ac984d..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,884 +0,0 @@
-############################################################-*-Makefile-*-####
-# Makefile for the Scala Compiler
-##############################################################################
-# $Id$
-
-##############################################################################
-# Configuration
-
-ROOT			 = .
-
-include $(ROOT)/Makefile.import
-
-##############################################################################
-# Variables - build contexts
-
-# command and target prefix
-prefix			?= main
-latest			 = $(LATEST_PREFIX)-$(prefix)-
-
-meta_PREFIX		 = meta
-meta_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(meta_PREFIX)
-meta_JC_OUTPUTDIR	 = $(meta_OBJECTDIR)/classes
-meta_JC_CLASSPATH	 = $(meta_JC_OUTPUTDIR)
-meta_SC_BOOTCLASSPATH	 =
-meta_SCALAC		 = $(SCALAC)
-
-boot_PREFIX		 = boot
-boot_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(boot_PREFIX)
-boot_LIBRARY_CLASSDIR	 = $(main_LIBRARY_CLASSDIR)
-boot_TOOLS_CLASSDIR	 = $(boot_OBJECTDIR)/lib/$(TOOLS_NAME)
-boot_JC_OUTPUTDIR	 = $(boot_TOOLS_CLASSDIR)
-boot_JC_CLASSPATH	 = $(boot_JC_OUTPUTDIR):$(boot_LIBRARY_CLASSDIR)
-boot_SC_BOOTCLASSPATH	 =
-boot_SCALAC		 = $(SCALAC)
-boot_SCALADOC		 = $(SCALADOC)
-boot_SCALA_CMD		 = $(SCALA)
-
-main_PREFIX		 = main
-main_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(main_PREFIX)
-main_LIBRARY_CLASSDIR	 = $(main_OBJECTDIR)/lib/$(LIBRARY_NAME)
-main_TOOLS_CLASSDIR	 = $(main_OBJECTDIR)/lib/$(TOOLS_NAME)
-main_JC_OUTPUTDIR	 = $(main_TOOLS_CLASSDIR)
-main_JC_CLASSPATH	 = $(main_JC_OUTPUTDIR):$(main_LIBRARY_CLASSDIR)
-main_RMIC_OUTPUTDIR	 = $(main_LIBRARY_CLASSDIR)
-main_RMIC_CLASSPATH	 = $(main_RMIC_OUTPUTDIR)
-main_SC_BOOTCLASSPATH	 = $(JRE_JARFILE)
-main_SCALAC		 = $(boot_OBJECTDIR)/bin/scalac
-main_SCALADOC		 = $(main_OBJECTDIR)/bin/scaladoc
-main_SCALA_CMD		 = $(main_OBJECTDIR)/bin/scala
-
-test_PREFIX		 = test
-test_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(test_PREFIX)
-test_LIBRARY_CLASSDIR	 = $(test_OBJECTDIR)/lib/$(LIBRARY_NAME)
-test_TOOLS_CLASSDIR	 = $(test_OBJECTDIR)/lib/$(TOOLS_NAME)
-test_JC_OUTPUTDIR	 = $(test_TOOLS_CLASSDIR)
-test_JC_CLASSPATH	 = $(test_JC_OUTPUTDIR):$(test_LIBRARY_CLASSDIR)
-test_SC_BOOTCLASSPATH	 = $(JRE_JARFILE)
-test_SCALAC		 = $(main_OBJECTDIR)/bin/scalac
-test_SCALADOC		 = $(test_OBJECTDIR)/bin/scaladoc
-test_SCALA_CMD		 = $(test_OBJECTDIR)/bin/scala
-
-#tnsc_PREFIX		 = tnsc
-#tnsc_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(tnsc_PREFIX)
-#tnsc_LIBRARY_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(LIBRARY_NAME)
-#tnsc_TOOLS_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(TOOLS_NAME)
-#tnsc_JC_OUTPUTDIR	 = $(tnsc_TOOLS_CLASSDIR)
-#tnsc_JC_CLASSPATH	 = $(tnsc_JC_OUTPUTDIR):$(tnsc_LIBRARY_CLASSDIR)
-#tnsc_RMIC_OUTPUTDIR	 = $(tnsc_LIBRARY_CLASSDIR)
-#tnsc_RMIC_CLASSPATH	 = $(tnsc_RMIC_OUTPUTDIR)
-#tnsc_SC_BOOTCLASSPATH	 = $(JRE_JARFILE)
-#tnsc_SCALAC		 = $(main_OBJECTDIR)/bin/scalansc
-#tnsc_SCALADOC		 = $(tnsc_OBJECTDIR)/bin/scaladoc
-#tnsc_SCALA_CMD		 = $(tnsc_OBJECTDIR)/bin/scala
-
-##############################################################################
-# Variables
-
-# java compilation defaults
-JC_COMPILER		 = PICO
-JC_OUTPUTDIR		 = $($(prefix)_JC_OUTPUTDIR)
-JC_CLASSPATH		 = $($(prefix)_JC_CLASSPATH)
-
-# rmic compilation defaults
-RMIC_COMPILER		 = RMIC
-RMIC_OUTPUTDIR		 = $($(prefix)_RMIC_OUTPUTDIR)
-RMIC_CLASSPATH		 = $($(prefix)_RMIC_CLASSPATH)
-
-# scala compilation defaults
-SC_COMPILER		 = $(prefix)_SCALAC
-SC_OUTPUTDIR		 = $(JC_OUTPUTDIR)
-SC_CLASSPATH		 = $(JC_CLASSPATH):$(PROJECT_SOURCEDIR)
-SC_BOOTCLASSPATH	 = $($(prefix)_SC_BOOTCLASSPATH)
-
-# scala documentation compilation defaults
-SDC_COMPILER		 = $(prefix)_SCALADOC
-
-##############################################################################
-# Commands - global
-
-all			: $(LATEST_PREFIX)-boot-all
-all			: main
-
-force			:
-	@$(make) all
-
-fastclean		:
-	$(RM) $(LATEST_PREFIX)-main*
-
-clean			:
-	$(RM) -r $(main_OBJECTDIR)
-
-distclean		:
-	$(RM) $(LATEST_PREFIX)-*
-	$(RM) -r $(PROJECT_OBJECTDIR)
-
-##############################################################################
-# Commands - project building
-
-meta			: meta.all
-boot			: boot.all
-main			: main.all
-test			: test.all
-#tnsc			: tnsc.all
-
-scripts			: main.scripts
-lamplib			: main.lamplib
-library			: main.library
-library-msil		: main.library-msil
-library-doc		: main.library-doc
-util			: main.util
-scalac			: main.scalac
-scalai			: main.scalai
-scaladoc		: main.scaladoc
-scalap			: main.scalap
-#dtd2scala		: main.dtd2scala
-scala4ant		: main.scala4ant
-scalatest		: main.scalatest
-tools			: main.tools
-jars			: main.jars
-
-$(prefix).all		: $(latest)all
-$(prefix).scripts	: $(latest)scripts
-$(prefix).lamplib	: $(latest)lamplib
-$(prefix).meta		: $(latest)meta
-$(prefix).library	: $(latest)library
-$(prefix).library-msil	: $(latest)library-msil
-$(prefix).library-doc	: $(latest)library-sdc
-$(prefix).util		: $(latest)util
-$(prefix).scalac	: $(latest)scalac
-$(prefix).scalai	: $(latest)scalai
-$(prefix).scaladoc	: $(latest)scaladoc
-$(prefix).scalap	: $(latest)scalap
-#$(prefix).dtd2scala	: $(latest)dtd2scala
-$(prefix).scala4ant	: $(latest)scala4ant
-$(prefix).scalatest	: $(latest)scalatest
-$(prefix).tools		: $(latest)tools
-$(prefix).jars		: $(latest)jars
-
-meta.%			: ; @$(make) prefix="meta" $@;
-boot.% 			: ; @$(make) prefix="boot" $@;
-main.%			: ; @$(make) prefix="main" $@;
-test.%			: ; @$(make) prefix="test" $@;
-#tnsc.%			: ; @$(make) prefix="tnsc" $@;
-
-.PHONY			: meta
-.PHONY			: boot
-.PHONY			: main
-.PHONY			: test
-#.PHONY			: tnsc
-
-.PHONY			: scripts
-.PHONY			: lamplib
-.PHONY			: library
-.PHONY			: library-msil
-.PHONY			: library-doc
-.PHONY			: util
-.PHONY			: scalac
-.PHONY			: scalai
-.PHONY			: scaladoc
-.PHONY			: scalap
-#.PHONY			: dtd2scala
-.PHONY			: scala4ant
-.PHONY			: scalatest
-.PHONY			: tools
-.PHONY			: jars
-
-.PHONY			: $(prefix).all
-.PHONY			: $(prefix).scripts
-.PHONY			: $(prefix).lamplib
-.PHONY			: $(prefix).meta
-.PHONY			: $(prefix).library
-.PHONY			: $(prefix).library-msil
-.PHONY			: $(prefix).library-doc
-.PHONY			: $(prefix).util
-.PHONY			: $(prefix).scalac
-.PHONY			: $(prefix).scalai
-.PHONY			: $(prefix).scaladoc
-.PHONY			: $(prefix).scalap
-#.PHONY			: $(prefix).dtd2scala
-.PHONY			: $(prefix).scala4ant
-.PHONY			: $(prefix).scalatest
-.PHONY			: $(prefix).tools
-.PHONY			: $(prefix).jars
-
-##############################################################################
-# Commands - version management
-
-version-set		:
-	@if [ -z "$(VERSION)" ]; then \
-	    $(ECHO) "Usage: $(MAKE) version-set VERSION=<version>"; \
-	    exit 1; \
-	else \
-	    $(call RUN,$(VERSION_SCRIPT) $(VERSION_FILE) set $(VERSION)); \
-	    $(make) scripts; \
-	fi
-
-version-update		:
-	$(VERSION_SCRIPT) $(VERSION_FILE) update
-	@$(make) scripts
-
-version-increment	:
-	$(VERSION_SCRIPT) $(VERSION_FILE) increment
-	@$(make) scripts
-
-.PHONY			: version-set
-.PHONY			: version-update
-.PHONY			: version-increment
-
-##############################################################################
-# Commands - CVS management
-
-cvs-fix-perms		:
-	$(strip \
-	    $(FIND) . -type f -perm +a=x | \
-	    $(GREP) -v '.*/bin/.*' | \
-	    $(XARGS) -r $(CHMOD) a-x)
-
-.PHONY			: cvs-fix-perms
-
-##############################################################################
-# Commands - source file generation
-
-generate		: meta.generate
-
-$(prefix).generate	: $(LATEST_PREFIX)-meta-all
-	@if [ -f .generated ]; then $(call RUN,$(RM) `$(CAT) .generated`); fi
-	$(strip $(JAVA) -cp $(call CYGWIN_PATH,$(JC_CLASSPATH)) \
-	    meta.GenerateAll $(call CYGWIN_FILE,$(PROJECT_SOURCEDIR)) \
-	    .generated)
-
-.PHONY			: generate
-.PHONY			: $(prefix).generate
-
-##############################################################################
-# Targets - top-level prefixes
-
-ifeq ($(prefix),meta)
-$(latest)all		: $(latest)lamplib
-$(latest)all		: $(latest)meta
-endif
-
-ifeq ($(prefix),boot)
-$(latest)all		: $(latest)scripts
-$(latest)all		: $(latest)lamplib
-$(latest)all		: $(latest)util
-$(latest)all		: $(latest)scalac
-endif
-
-ifeq ($(prefix),main)
-$(latest)all		: $(latest)scripts
-$(latest)all		: $(latest)lamplib
-$(latest)all		: $(latest)library
-$(latest)all		: $(latest)tools
-endif
-
-ifeq ($(prefix),test)
-$(latest)all		: $(latest)lamplib
-$(latest)all		: $(latest)library
-$(latest)all		: $(latest)tools
-endif
-
-#ifeq ($(prefix),tnsc)
-#$(latest)all		: $(latest)lamplib
-#$(latest)all		: $(latest)library
-#$(latest)all		: $(latest)tools
-#endif
-
-$(latest)all		:
-	$(TOUCH) $@
-
-$(LATEST_PREFIX)-meta-%	: ; @$(make) prefix="meta" $@
-$(LATEST_PREFIX)-boot-%	: ; @$(make) prefix="boot" $@
-$(LATEST_PREFIX)-main-%	: ; @$(make) prefix="main" $@
-$(LATEST_PREFIX)-test-%	: ; @$(make) prefix="test" $@
-#$(LATEST_PREFIX)-tnsc-%	: ; @$(make) prefix="tnsc" $@
-
-##############################################################################
-# Targets - scala scripts
-
-SCRIPTS_PREFIX		 = $($(prefix)_OBJECTDIR)
-SCRIPTS_BINARYDIR	 = $(SCRIPTS_PREFIX)/bin
-SCRIPTS_TEMPLATE_NAME	 = $(SCRIPTS_WRAPPER_NAME).tmpl
-SCRIPTS_TEMPLATE_FILE	 = $(PROJECT_BINARYDIR)/$(SCRIPTS_TEMPLATE_NAME)
-SCRIPTS_WRAPPER_NAME	 = .scala_wrapper
-SCRIPTS_WRAPPER_FILE	 = $(SCRIPTS_BINARYDIR)/$(SCRIPTS_WRAPPER_NAME)
-SCRIPTS_ALIASES_NAMES	+= scala
-SCRIPTS_ALIASES_NAMES	+= scala-debug
-SCRIPTS_ALIASES_NAMES	+= scala-info
-SCRIPTS_ALIASES_NAMES	+= scalac
-SCRIPTS_ALIASES_NAMES	+= scalac-debug
-#SCRIPTS_ALIASES_NAMES	+= scalansc
-#SCRIPTS_ALIASES_NAMES	+= scalansc-debug
-SCRIPTS_ALIASES_NAMES	+= scaladoc
-SCRIPTS_ALIASES_NAMES	+= scaladoc-debug
-SCRIPTS_ALIASES_NAMES	+= scalarun
-SCRIPTS_ALIASES_NAMES	+= scalarun-debug
-SCRIPTS_ALIASES_NAMES	+= scalaint
-SCRIPTS_ALIASES_NAMES	+= scalaint-debug
-#SCRIPTS_ALIASES_NAMES	+= dtd2scala
-SCRIPTS_ALIASES_NAMES	+= scalap
-SCRIPTS_ALIASES_NAMES	+= scalatest
-#SCRIPTS_ALIASES_NAMES	+= scalanstest
-SCRIPTS_ALIASES_FILES	+= $(SCRIPTS_ALIASES_NAMES:%=$(SCRIPTS_BINARYDIR)/%)
-SCRIPTS_MACRO		 = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(SCRIPTS_PREFIX)/%=$$PREFIX/%)"'@g
-
-$(latest)scripts	: $(SCRIPTS_ALIASES_FILES)
-	$(TOUCH) $@
-
-$(SCRIPTS_ALIASES_FILES): $(SCRIPTS_WRAPPER_FILE)
-	@if [ ! -h $@ ]; then \
-	    $(call RUN,$(LN) -s $(notdir $(SCRIPTS_WRAPPER_FILE)) $@); \
-	fi
-
-$(SCRIPTS_WRAPPER_FILE)	: ROOT                    := $(shell cd $(ROOT) && pwd)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_VERSION           ?= $(PROJECT_VERSION)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_LIBRARY_SOURCES   ?= $(PROJECT_SOURCEDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_LIBRARY_CLASSES   ?= $(LIBRARY_CLASSDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_TOOLS_CLASSES     ?= $(TOOLS_CLASSDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_FJBG_CLASSES      ?= $(FJBG_JARFILE)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_MSIL_CLASSES      ?= $(MSIL_JARFILE)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_JAVA_CMD          ?= java
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_JAVA_ARGS         ?= -enableassertions
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_SCALA_CMD         ?= $($(prefix)_SCALA_CMD)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_SCALA_ARGS        ?= -enableassertions
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_SRCDIR       ?= $(PROJECT_TESTDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_OBJDIR       ?= ""
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_ASSEMBLIES   ?= $(MSIL_HOME)
-$(SCRIPTS_WRAPPER_FILE)	: $(VERSION_FILE)
-$(SCRIPTS_WRAPPER_FILE)	: $(PROJECT_ROOT)/Makefile
-$(SCRIPTS_WRAPPER_FILE)	: $(PROJECT_ROOT)/Makefile.config
-$(SCRIPTS_WRAPPER_FILE)	: $(PROJECT_ROOT)/Makefile.import
-$(SCRIPTS_WRAPPER_FILE)	: $(PROJECT_ROOT)/Makefile.private
-$(SCRIPTS_WRAPPER_FILE)	: $(SCRIPTS_TEMPLATE_FILE)
-	@[ -d $(@D) ] || $(call RUN,$(MKDIR) -p $(@D))
-	@[ -e $@ ] || $(call RUN,$(RM) $@)
-	@$(ECHO) "Generating file $@"
-	@$(SED) \
-	    $(call SCRIPTS_MACRO,VERSION) \
-	    $(call SCRIPTS_MACRO,LIBRARY_SOURCES) \
-	    $(call SCRIPTS_MACRO,LIBRARY_CLASSES) \
-	    $(call SCRIPTS_MACRO,TOOLS_CLASSES) \
-	    $(call SCRIPTS_MACRO,FJBG_CLASSES) \
-	    $(call SCRIPTS_MACRO,MSIL_CLASSES) \
-	    $(call SCRIPTS_MACRO,JAVA_CMD) \
-	    $(call SCRIPTS_MACRO,JAVA_ARGS) \
-	    $(call SCRIPTS_MACRO,SCALA_CMD) \
-	    $(call SCRIPTS_MACRO,SCALA_ARGS) \
-	    $(call SCRIPTS_MACRO,TEST_SRCDIR) \
-	    $(call SCRIPTS_MACRO,TEST_OBJDIR) \
-	    $(call SCRIPTS_MACRO,TEST_ASSEMBLIES) \
-	    $(SCRIPTS_TEMPLATE_FILE) > $@
-	@macros=`$(SED) -n -es'@.*{#\(.*\)#}.*@\1@p' < $@`; \
-	if [ -n "$$macros" ]; then \
-	    $(ECHO) "error: there are undefined macros: $$macros"; \
-	    $(RM) $@; \
-	    exit 1; \
-	fi;
-	$(CHMOD) 555 $@
-
-##############################################################################
-# Targets - lamp library
-
-PROJECT_SOURCES		+= $(LAMPLIB_SOURCES)
-LAMPLIB_ROOT		 = $(PROJECT_SOURCEDIR)/ch/epfl/lamp
-LAMPLIB_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/lamplib.lst)
-LAMPLIB_SOURCES		+= $(LAMPLIB_LIST:%=$(LAMPLIB_ROOT)/%)
-LAMPLIB_JC_FILES	+= $(LAMPLIB_SOURCES)
-
-$(latest)lamplib	: $(latest)lamplib-jc
-$(latest)lamplib	:
-	$(TOUCH) $@
-
-$(latest)lamplib-jc	: $(LAMPLIB_JC_FILES)
-	@$(make) jc target=LAMPLIB LAMPLIB_JC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - meta library
-
-PROJECT_SOURCES		+= $(META_SOURCES)
-META_ROOT		 = $(PROJECT_SOURCEDIR)/meta
-META_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/meta.lst)
-META_SOURCES		+= $(META_LIST:%=$(META_ROOT)/%)
-META_JC_FILES		+= $(META_SOURCES)
-
-$(latest)meta		: $(latest)meta-jc
-$(latest)meta		:
-	$(TOUCH) $@
-
-$(latest)meta-jc	: $(META_JC_FILES)
-	@$(make) jc target=META META_JC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala library
-
-PROJECT_SOURCES		+= $(LIBRARY_SOURCES)
-LIBRARY_NAME		 = $(PROJECT_NAME)
-LIBRARY_ROOT		 = $(PROJECT_SOURCEDIR)/scala
-NLIBRARY_ROOT	 	 = $(PROJECT_NSOURCEDIR)/scala
-LIBRARY_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/library.lst)
-LIBRARY_SOURCES		+= $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%)
-LIBRARY_CLASSDIR	 = $($(prefix)_LIBRARY_CLASSDIR)
-LIBRARY_JC_FILES	+= $(filter %.java,$(LIBRARY_SOURCES))
-LIBRARY_JC_FLAGS	+= $(JC_FLAGS) -scala-hack
-LIBRARY_JC_OUTPUTDIR	 = $(LIBRARY_CLASSDIR)
-LIBRARY_JC_CLASSPATH	 = $(LIBRARY_JC_OUTPUTDIR)
-LIBRARY_RMIC_CLASSES	+= scala.runtime.distributed.ChannelImpl
-LIBRARY_RMIC_CLASSES	+= scala.runtime.distributed.ReferenceImpl
-LIBRARY_RMIC_files	+= $(subst .,/,$(LIBRARY_RMIC_CLASSES))
-LIBRARY_RMIC_FILES	+= $(LIBRARY_RMIC_files:%=$(LIBRARY_CLASSDIR)/%.class)
-LIBRARY_RMIC_FLAGS	+= -v1.2
-LIBRARY_RMIC_OUTPUTDIR	 = $(LIBRARY_CLASSDIR)
-LIBRARY_RMIC_CLASSPATH	 = $(LIBRARY_RMIC_OUTPUTDIR)
-LIBRARY_SC_FILES	+= $(filter %.scala,$(LIBRARY_SOURCES))
-LIBRARY_SC_OUTPUTDIR	 = $(LIBRARY_JC_OUTPUTDIR)
-LIBRARY_SC_CLASSPATH	 = $(LIBRARY_JC_CLASSPATH):$(PROJECT_SOURCEDIR)
-LIBRARY_SDC_FLAGS	+= -windowtitle "Scala Library Documentation"
-LIBRARY_SDC_FLAGS	+= -doctitle "Scala<br/>$(PROJECT_VERSION)"
-LIBRARY_SDC_FILES	+= $(LIBRARY_SC_FILES)
-LIBRARY_SDC_OUTPUTDIR	 = $($(prefix)_OBJECTDIR)/doc/api
-LIBRARY_JAR_ARCHIVE	 = $(LIBRARY_CLASSDIR).jar
-LIBRARY_JAR_INPUTDIR	 = $(LIBRARY_CLASSDIR)
-LIBRARY_JAR_FILES	+= .
-
-$(latest)library	: $(latest)library-jc
-#$(latest)library	: $(latest)library-rmic
-$(latest)library	: $(latest)library-sc
-$(latest)library	:
-	$(TOUCH) $@
-
-$(latest)library-jc	: $(LIBRARY_JC_FILES)
-	@$(make) jc target=LIBRARY LIBRARY_JC_FILES='$(subst $$,$$$$,$?)'
-	$(TOUCH) $@
-
-$(latest)library-rmic	: $(LIBRARY_RMIC_FILES)
-	@$(make) rmic target=LIBRARY
-	$(TOUCH) $@
-
-$(latest)library-sc	: $(LIBRARY_SC_FILES)
-#	@if [ "$(prefix)" = tnsc ]; then \
-#	  $(make) sc target=LIBRARY LIBRARY_SC_FLAGS='$$(SC_FLAGS) -nopredefs'\
-#	  LIBRARY_SC_FILES='$(NLIBRARY_ROOT)/ScalaObject.scala $(LIBRARY_ROOT)/Predef.scala $(LIBRARY_ROOT)/runtime/ScalaRunTime.scala'; \
-#	fi
-	@$(make) sc target=LIBRARY LIBRARY_SC_FILES='$(subst $$,$$$$,$?)'
-	$(TOUCH) $@
-
-$(latest)library-sdc	: $(LIBRARY_SDC_FILES)
-	@$(make) sdc target=LIBRARY
-	$(TOUCH) $@
-
-ifneq ($(LIBRARY_JAR_ARCHIVE),.jar)
-
-$(LIBRARY_JAR_ARCHIVE)	: $(latest)library
-$(LIBRARY_JAR_ARCHIVE)	:
-	@$(ECHO) "      [jar] Building jar: $(LIBRARY_JAR_ARCHIVE)"
-	@$(make) jar target=LIBRARY \
-	    LIBRARY_JAR=@$(JAR)
-
-endif
-
-##############################################################################
-# Targets - scala library
-
-LIBRARY_MSIL_ROOT	 = $(LIBRARY_ROOT)
-LIBRARY_MSIL_LIST	 = $(call READLIST,$(PROJECT_LISTDIR)/library-msil.lst)
-LIBRARY_MSIL_SOURCES	 = $(LIBRARY_MSIL_LIST:%=$(LIBRARY_MSIL_ROOT)/%)
-MSIL_SRCDIR		 = $(PROJECT_SOURCEDIR)/msil
-#MSIL_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/msil
-MSIL_OBJECTDIR		 = .
-
-ASSEMBLY_INFO		 = $(MSIL_SRCDIR)/AssemblyInfo.cs
-ASSEMBLY_INFO_TMPL	 = $(MSIL_SRCDIR)/AssemblyInfo.cs.tmpl
-SCALA_PART1_DLL		 = $(MSIL_OBJECTDIR)/scala_part1.dll
-SCALA_PART1_IL		 = $(MSIL_OBJECTDIR)/scala_part1.il
-SCALA_PART2		 = scala_part2
-SCALA_PART2_IL		 = $(MSIL_OBJECTDIR)/$(SCALA_PART2).il
-SCALA_PART2_IL_DIFF	 = $(MSIL_SRCDIR)/$(SCALA_PART2_IL).diff
-SCALA_PART2_IL_DIFF_TMPL = $(MSIL_OBJECTDIR)/$(SCALA_PART2_IL_DIFF).tmpl
-SCALA_DLL		 = $(MSIL_OBJECTDIR)/scala.dll
-SCALA_IL		 = $(MSIL_OBJECTDIR)/scala.il
-
-LIBRARY_MSIL_CSC_FILES	 = $(filter %.cs,$(LIBRARY_MSIL_SOURCES)) $(ASSEMBLY_INFO)
-LIBRARY_MSIL_CSC_TARGET  = library
-LIBRARY_MSIL_CSC_OUTPUTFILE = $(SCALA_PART1_DLL)
-LIBRARY_MSIL_CSC_KEYFILE = $(MSIL_KEYFILE)
-LIBRARY_MSIL_CSC_FLAGS	 = /nologo /warn:0
-
-LIBRARY_MSIL_SC_FILES	 = $(filter %.scala,$(LIBRARY_MSIL_SOURCES))
-LIBRARY_MSIL_SC_FLAGS	 = -r $(call CYGWIN_PATH,$(SCALA_PART1_DLL):$(ROOT)/lib)
-LIBRARY_MSIL_SC_FLAGS	+= -o $(SCALA_PART2) -g
-LIBRARY_MSIL_SC_TARGET	 = msil
-SN			 = sn
-
-$(latest)library-msil	: $(latest)library-msil-sc
-$(latest)library-msil	:
-	$(TOUCH) $@
-
-MSIL_PLATFORM		?= MONO
-
-MSCLR_ILASM_FLAGS	 = /nol /qui /debug
-MSCLR_ILDASM_FLAGS	 = /text /source /lin
-
-$(latest)library-msil-csc: $(LIBRARY_MSIL_CSC_FILES) $(ASSEMBLY_INFO)
-	@[ -d "$(MSIL_OBJECTDIR)" ] || $(MKDIR) -p "$(MSIL_OBJECTDIR)"
-	@$(make) csc target=LIBRARY_MSIL
-	@$(make) ildasm ILDASM_OUTPUTFILE=$(SCALA_PART1_IL).tmp ILDASM_FILES=$(SCALA_PART1_DLL)
-	$(CAT) $(SCALA_PART1_IL).tmp | $(DOS2UNIX)| \
-	    $(SED) -e "s/\(int16\|int32\|int64\|float32\|float64\)[ ]*dummy//" \
-	    -e "s/__/\$$/g" \
-	    -e "s/box\$$array/box__array/g" \
-	    -e "s/[ \t]*$$//" > $(SCALA_PART1_IL)
-	@$(make) ilasm ILASM_FLAGS='/dll' ILASM_OUTPUTFILE=$(SCALA_PART1_DLL) ILASM_FILES=$(SCALA_PART1_IL)
-	$(TOUCH) $@
-
-$(ASSEMBLY_INFO)	: $(ASSEMBLY_INFO_TMPL) $(VERSION_FILE)
-	$(SED) s/SCALA_VERSION/$(PROJECT_VERSION)/ $(ASSEMBLY_INFO_TMPL) > $@
-
-$(latest)library-msil-sc: $(SCALA_DLL)
-	$(TOUCH) $@
-
-$(SCALA_DLL)		: $(SCALA_IL)
-	@$(make) ilasm ILASM_FLAGS='/dll' ILASM_OUTPUTFILE=$(SCALA_DLL) ILASM_FILES=$(SCALA_IL)
-	$(SN) -R $(SCALA_DLL) $(MSIL_KEYFILE)
-
-
-$(SCALA_IL)		: $(SCALA_PART2_IL)
-	$(CAT) $(SCALA_PART1_IL) $(SCALA_PART2_IL) |\
-	    $(SED) "s/assembly scala_part1/assembly scala/" > $@
-
-$(SCALA_PART2_IL)	: $(latest)library-msil-csc $(LIBRARY_MSIL_SC_FILES)
-$(SCALA_PART2_IL)	: $(SCALA_PART2_IL_DIFF)
-	@$(make) sc target=LIBRARY_MSIL
-	$(DOS2UNIX) $(SCALA_PART2_IL)
-	$(PATCH) -o $(SCALA_PART2_IL).new $(SCALA_PART2_IL) $(SCALA_PART2_IL_DIFF)
-	$(SED) -e "s/\[scala_part1\]//g" $(SCALA_PART2_IL).new > $@
-
-$(SCALA_PART2_IL_DIFF)	: $(SCALA_PART2_IL_DIFF_TMPL) $(VERSION_FILE)
-	$(SED) "s/SCALA_VERSION/$(subst .,:,$(PROJECT_VERSION))/" \
-	    $(SCALA_PART2_IL_DIFF_TMPL) > $@
-
-
-##############################################################################
-# Targets - scala tools - util
-
-PROJECT_SOURCES		+= $(UTIL_SOURCES)
-UTIL_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/util
-UTIL_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/util.lst)
-UTIL_SOURCES		+= $(UTIL_LIST:%=$(UTIL_ROOT)/%)
-UTIL_JC_FILES		+= $(filter %.java,$(UTIL_SOURCES))
-UTIL_SC_FILES		+= $(filter %.scala,$(UTIL_SOURCES))
-
-$(latest)util		: $(latest)util-jc
-$(latest)util		: $(latest)util-sc
-$(latest)util		:
-	$(TOUCH) $@
-
-$(latest)util-jc	: $(UTIL_JC_FILES)
-	@$(make) jc target=UTIL UTIL_JC_FILES='$?'
-	$(TOUCH) $@
-
-$(latest)util-sc	: $(UTIL_SC_FILES)
-	@$(make) sc target=UTIL UTIL_SC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - compiler
-
-PROJECT_SOURCES		+= $(SCALAC_SOURCES)
-SCALAC_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scalac
-SCALAC_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scalac.lst)
-SCALAC_SOURCES		+= $(SCALAC_LIST:%=$(SCALAC_ROOT)/%)
-SCALAC_JC_FILES		+= $(filter %.java,$(SCALAC_SOURCES))
-SCALAC_JC_CLASSPATH	 = $(JC_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE)
-SCALAC_SC_FILES		+= $(filter %.scala,$(SCALAC_SOURCES))
-SCALAC_SC_CLASSPATH	 = $(SCALAC_JC_CLASSPATH):$(PROJECT_SOURCEDIR)
-
-$(latest)scalac		: $(latest)scalac-jc
-$(latest)scalac		: $(latest)scalac-sc
-$(latest)scalac		:
-	$(TOUCH) $@
-
-$(latest)scalac-jc	: $(SCALAC_JC_FILES)
-	@$(make) jc target=SCALAC SCALAC_JC_FILES='$?'
-	$(TOUCH) $@
-
-$(latest)scalac-sc	: $(SCALAC_SC_FILES)
-	@$(make) sc target=SCALAC SCALAC_SC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - interpreter
-
-PROJECT_SOURCES		+= $(SCALAI_SOURCES)
-SCALAI_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scalai
-SCALAI_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scalai.lst)
-SCALAI_SOURCES		+= $(SCALAI_LIST:%=$(SCALAI_ROOT)/%)
-SCALAI_JC_FILES		 = $(SCALAI_SOURCES)
-
-$(latest)scalai		: $(latest)scalai-jc
-$(latest)scalai		:
-	$(TOUCH) $@
-
-$(latest)scalai-jc	: $(SCALAI_JC_FILES)
-	@$(make) jc target=SCALAI SCALAI_JC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - scaladoc
-
-PROJECT_SOURCES		+= $(SCALADOC_SOURCES)
-SCALADOC_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scaladoc
-SCALADOC_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scaladoc.lst)
-SCALADOC_SOURCES	+= $(SCALADOC_LIST:%=$(SCALADOC_ROOT)/%)
-SCALADOC_JC_FILES	+= $(filter %.java,$(SCALADOC_SOURCES))
-SCALADOC_SC_FILES	+= $(filter %.scala,$(SCALADOC_SOURCES))
-SCALADOC_RSRC_LIST	+= resources/script.js
-SCALADOC_RSRC_LIST	+= resources/style.css
-SCALADOC_RSRC_LIST	+= resources/xhtml-lat1.ent
-SCALADOC_RSRC_LIST	+= resources/xhtml-special.ent
-SCALADOC_RSRC_LIST	+= resources/xhtml-symbol.ent
-SCALADOC_RSRC_LIST	+= resources/xhtml1-transitional.dtd
-SCALADOC_RSRC_FILES	+= $(SCALADOC_RSRC_LIST:%=$(SCALADOC_ROOT)/%)
-SCALADOC_RSRC_OUTPUTDIR	 = $(SCALADOC_ROOT:$(PROJECT_SOURCEDIR)/%=$(JC_OUTPUTDIR)/%)
-
-$(latest)scaladoc	: $(latest)scaladoc-jc
-$(latest)scaladoc	: $(latest)scaladoc-sc
-$(latest)scaladoc	: $(latest)scaladoc-rsrc
-$(latest)scaladoc	:
-	$(TOUCH) $@
-
-$(latest)scaladoc-jc	: $(SCALADOC_JC_FILES)
-	@$(make) jc target=SCALADOC SCALADOC_JC_FILES='$?'
-	$(TOUCH) $@
-
-$(latest)scaladoc-sc	: $(SCALADOC_SC_FILES)
-	@$(make) sc target=SCALADOC SCALADOC_SC_FILES='$?'
-	$(TOUCH) $@
-
-$(latest)scaladoc-rsrc	: $(SCALADOC_RSRC_FILES)
-	$(strip $(MIRROR) -m 644 -C $(SCALADOC_ROOT) $(SCALADOC_RSRC_LIST) \
-	    $(SCALADOC_RSRC_OUTPUTDIR))
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - scalap
-
-PROJECT_SOURCES		+= $(SCALAP_SOURCES)
-SCALAP_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scalap
-SCALAP_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scalap.lst)
-SCALAP_SOURCES		+= $(SCALAP_LIST:%=$(SCALAP_ROOT)/%)
-SCALAP_SC_FILES	 	+= $(SCALAP_SOURCES)
-
-$(latest)scalap		: $(latest)scalap-sc
-$(latest)scalap		:
-	$(TOUCH) $@
-
-$(latest)scalap-sc	: $(SCALAP_SC_FILES)
-	@$(make) sc target=SCALAP SCALAP_SC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - dtd2scala
-
-#PROJECT_SOURCES		+= $(DTD2SCALA_SOURCES)
-#DTD2SCALA_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/dtd2scala
-#DTD2SCALA_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/dtd2scala.lst)
-#DTD2SCALA_SOURCES	+= $(DTD2SCALA_LIST:%=$(DTD2SCALA_ROOT)/%)
-#DTD2SCALA_SC_FILES	+= $(filter %.scala,$(DTD2SCALA_SOURCES))
-#DTD2SCALA_RSRC_LIST	+= $(filter %.xml,$(DTD2SCALA_LIST))
-#DTD2SCALA_RSRC_FILES	+= $(filter %.xml,$(DTD2SCALA_SOURCES))
-#DTD2SCALA_RSRC_OUTPUTDIR = $(DTD2SCALA_ROOT:$(PROJECT_SOURCEDIR)/%=$(JC_OUTPUTDIR)/%)
-
-#$(latest)dtd2scala	: $(latest)dtd2scala-sc
-#$(latest)dtd2scala	: $(latest)dtd2scala-rsrc
-#$(latest)dtd2scala	:
-#	$(TOUCH) $@
-
-#$(latest)dtd2scala-sc	: $(DTD2SCALA_SC_FILES)
-#	@$(make) sc target=DTD2SCALA DTD2SCALA_SC_FILES='$?'
-#	$(TOUCH) $@
-
-#$(latest)dtd2scala-rsrc	: $(DTD2SCALA_RSRC_FILES)
-#	$(strip $(MIRROR) -m 644 -C $(DTD2SCALA_ROOT) $(DTD2SCALA_RSRC_LIST) \
-#	    $(DTD2SCALA_RSRC_OUTPUTDIR))
-#	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - scala4ant
-
-PROJECT_SOURCES		+= $(SCALA4ANT_SOURCES)
-SCALA4ANT_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scala4ant
-SCALA4ANT_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scala4ant.lst)
-SCALA4ANT_SOURCES	+= $(SCALA4ANT_LIST:%=$(SCALA4ANT_ROOT)/%)
-SCALA4ANT_JC_FILES	+= $(filter %.java,$(SCALA4ANT_SOURCES))
-SCALA4ANT_JC_CLASSPATH	 = $(JC_CLASSPATH):$(ANT_JARFILE)
-SCALA4ANT_SC_FILES	+= $(filter %.scala,$(SCALA4ANT_SOURCES))
-SCALA4ANT_SC_CLASSPATH	 = $(SC_CLASSPATH):$(ANT_JARFILE)
-
-$(latest)scala4ant	: $(latest)scala4ant-jc
-$(latest)scala4ant	: $(latest)scala4ant-sc
-$(latest)scala4ant	:
-	$(TOUCH) $@
-
-$(latest)scala4ant-jc	: $(SCALA4ANT_JC_FILES)
-	@$(make) jc target=SCALA4ANT SCALA4ANT_JC_FILES='$?'
-	$(TOUCH) $@
-
-$(latest)scala4ant-sc	: $(SCALA4ANT_SC_FILES)
-	@$(make) sc target=SCALA4ANT SCALA4ANT_SC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools - scalatest
-
-PROJECT_SOURCES		+= $(SCALATEST_SOURCES)
-SCALATEST_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scalatest
-SCALATEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/scalatest.lst)
-SCALATEST_SOURCES	+= $(SCALATEST_LIST:%=$(SCALATEST_ROOT)/%)
-SCALATEST_JC_FILES	+= $(SCALATEST_SOURCES)
-
-$(latest)scalatest	: $(latest)scalatest-jc
-$(latest)scalatest	:
-	$(TOUCH) $@
-
-$(latest)scalatest-jc	: $(SCALATEST_JC_FILES)
-	@$(make) jc target=SCALATEST SCALATEST_JC_FILES='$?'
-	$(TOUCH) $@
-
-##############################################################################
-# Targets - scala tools
-
-TOOLS_NAME		 = tools
-TOOLS_CLASSDIR		 = $($(prefix)_TOOLS_CLASSDIR)
-TOOLS_JAR_ARCHIVE	 = $(TOOLS_CLASSDIR).jar
-TOOLS_JAR_INPUTDIR	 = $(TOOLS_CLASSDIR)
-TOOLS_JAR_FILES		+= .
-
-$(latest)tools		: $(latest)lamplib
-$(latest)tools		: $(latest)util
-#ifneq ($(prefix),tnsc)
-$(latest)tools		: $(latest)scalac
-$(latest)tools		: $(latest)scalai
-$(latest)tools		: $(latest)scaladoc
-#else
-#$(latest)tools		: $(latest)nsc
-#endif
-$(latest)tools		: $(latest)scalap
-#$(latest)tools		: $(latest)dtd2scala
-$(latest)tools		: $(latest)scala4ant
-$(latest)tools		: $(latest)scalatest
-$(latest)tools		:
-	$(TOUCH) $@
-
-ifneq ($(TOOLS_JAR_ARCHIVE),.jar)
-
-$(TOOLS_JAR_ARCHIVE)	: $(latest)tools
-$(TOOLS_JAR_ARCHIVE)	:
-	@$(ECHO) "      [jar] Building jar: $(TOOLS_JAR_ARCHIVE)"
-	@$(make) jar target=TOOLS \
-	    TOOLS_JAR=@$(JAR)
-
-endif
-
-##############################################################################
-# Targets - scala jars
-
-$(latest)jars		: $(latest)library
-$(latest)jars		: $(latest)tools
-	@$(ECHO) "      [jar] Building jar: $(LIBRARY_JAR_ARCHIVE)"
-	@$(make) jar target=LIBRARY \
-	    LIBRARY_JAR=@$(JAR)
-	@$(ECHO) "      [jar] Building jar: $(TOOLS_JAR_ARCHIVE)"
-	@$(make) jar target=TOOLS \
-	    TOOLS_JAR=@$(JAR)
-	@$(TOUCH) $@
-
-##############################################################################
-# Targets - template expansion
-
-# generation of Function<n>.scala
-FUNCTION_FILES		+= $(filter $(LIBRARY_ROOT)/Function%.scala,$(LIBRARY_SOURCES))
-FUNCTION_TEMPLATE	 = $(LIBRARY_ROOT)/Function.scala.tmpl
-
-# generation of Tuple<n>.scala
-TUPLE_FILES		+= $(filter $(LIBRARY_ROOT)/Tuple%.scala,$(LIBRARY_SOURCES))
-TUPLE_TEMPLATE		 = $(LIBRARY_ROOT)/Tuple.scala.tmpl
-
-distclean		: distclean.generate
-distclean.generate	:
-	@if [ -f .generated ]; then $(call RUN,$(RM) `$(CAT) .generated`); fi
-	$(RM) .generated
-
-$(FUNCTION_FILES)	: $(META_SOURCES) $(FUNCTION_TEMPLATE)
-	@$(make) generate
-
-$(TUPLE_FILES)		: $(META_SOURCES) $(TUPLE_TEMPLATE)
-	@$(make) generate
-
-%			: $(META_SOURCES) %.tmpl
-	@$(make) generate
-
-##############################################################################
-# Includes
-
-include $(PROJECT_ROOT)/Makefile.distrib
-include $(PROJECT_SUPPORTDIR)/make/jc.mk
-include $(PROJECT_SUPPORTDIR)/make/rmic.mk
-include $(PROJECT_SUPPORTDIR)/make/jar.mk
-include $(PROJECT_SUPPORTDIR)/make/sc.mk
-include $(PROJECT_SUPPORTDIR)/make/sdc.mk
-include $(PROJECT_SUPPORTDIR)/make/csc.mk
-include $(PROJECT_SUPPORTDIR)/make/ilasm.mk
-include $(PROJECT_SUPPORTDIR)/make/ildasm.mk
-
-##############################################################################
-# Beta code
-
-show-missing-library	:
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-	@for filename in $(LIBRARY_SOURCES:%='%'); do \
-	  $(ECHO) $$filename | $(TR) " " "\n" >> /tmp/check.tmp.log; \
-	done
-	@$(SORT) /tmp/check.tmp.log > /tmp/check.mkf.log
-	@$(FIND) $(LIBRARY_ROOT) -name "tools" -prune -o \( -name '*.java' -o -name '*.scala' \) -print | $(SORT) > /tmp/check.lst.log
-	@$(ECHO) Missing library source files:
-	@$(COMM) -1 -3 /tmp/check.mkf.log /tmp/check.lst.log
-	@$(ECHO)
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-
-show-missing-examples	:
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-	@for filename in $(EXAMPLES_FILES:%='%'); do \
-	  $(ECHO) $$filename | $(TR) " " "\n" >> /tmp/check.tmp.log; \
-	done
-	@$(SORT) /tmp/check.tmp.log > /tmp/check.mkf.log
-	@$(FIND) $(EXAMPLES_ROOT) -name '*.scala' | $(SORT) >/tmp/check.lst.log
-	@$(ECHO) Missing examples:
-	@$(COMM) -1 -3 /tmp/check.mkf.log /tmp/check.lst.log
-	@$(ECHO)
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-
-show-missing-test	:
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-	@for filename in $(TEST_FILES:%='%'); do \
-	  $(ECHO) $$filename | $(TR) " " "\n" >> /tmp/check.tmp.log; \
-	done
-	@$(SORT) /tmp/check.tmp.log > /tmp/check.mkf.log
-	@$(FIND) $(TEST_ROOT) -name '*.scala' | $(SORT) > /tmp/check.lst.log
-	@$(ECHO) Missing tests:
-	@$(COMM) -1 -3 /tmp/check.mkf.log /tmp/check.lst.log
-	@$(ECHO)
-	@$(RM) /tmp/check.tmp.log /tmp/check.mkf.log /tmp/check.lst.log
-
-show-missing		: show-missing-library
-show-missing		: show-missing-examples
-show-missing		: show-missing-test
-
-.PHONY			: show-missing-library
-.PHONY			: show-missing-examples
-.PHONY			: show-missing-test
-.PHONY			: show-missing
-
-##############################################################################
diff --git a/Makefile.config b/Makefile.config
deleted file mode 100644
index 95bdfbe107..0000000000
--- a/Makefile.config
+++ /dev/null
@@ -1,144 +0,0 @@
-############################################################-*-Makefile-*-####
-# Project Configuration
-##############################################################################
-# $Id$
-
-##############################################################################
-# Read local configuration
-
--include $(ROOT)/Makefile.private
-
-##############################################################################
-# Project setup
-
-PROJECT_NAME		?= scala
-PROJECT_ROOT		?= $(ROOT)
-PROJECT_BINARYDIR	?= $(PROJECT_ROOT)/sources/bin
-PROJECT_CONFIGDIR	?= $(PROJECT_ROOT)/config
-PROJECT_DOCUMENTDIR	?= $(PROJECT_ROOT)/doc
-PROJECT_LIBRARYDIR	?= $(PROJECT_ROOT)/lib
-PROJECT_SUPPORTDIR	?= $(PROJECT_ROOT)/support
-PROJECT_SOURCEDIR	?= $(PROJECT_ROOT)/sources
-PROJECT_OBJECTDIR	?= $(PROJECT_ROOT)/objects
-PROJECT_TESTDIR		?= $(PROJECT_ROOT)/test/files
-PROJECT_DISTRIBDIR	?= $(PROJECT_ROOT)/distribs
-PROJECT_ARCHIVEDIR	?= $(PROJECT_DISTRIBDIR)
-PROJECT_LISTDIR		?= $(PROJECT_CONFIGDIR)/list
-
-##############################################################################
-# External libraries
-
-# JRE
-JRE_HOME		?= $(PROJECT_LIBDIR)/jre
-JRE_JARFILE		?= $(JRE_HOME)/lib/rt.jar
-
-# FJBG
-FJBG_HOME		?= $(PROJECT_LIBDIR)/fjbg
-FJBG_JARFILE            ?= $(FJBG_HOME)/fjbg.jar
-
-# MSIL
-MSIL_HOME		?= $(PROJECT_LIBDIR)/msil
-MSIL_JARFILE		?= $(MSIL_HOME)/msil.jar
-MSIL_DLLFILE		?= $(MSIL_HOME)/scala.dll
-MSIL_KEYFILE		?= lamp.key
-
-# Ant
-ANT_HOME		?= $(PROJECT_LIBDIR)/ant
-ANT_JARFILE		?= $(ANT_HOME)/lib/ant.jar
-
-##############################################################################
-# Standard tools
-
-BASENAME		?= basename
-BZIP2			?= bzip2
-CAT			?= cat
-CHMOD			?= chmod
-COMM			?= comm
-CP			?= cp
-CVS			?= cvs
-DATE			?= date
-DIRNAME			?= dirname
-DOS2UNIX		?= dos2unix
-ECHO			?= echo
-EXPR			?= expr
-FIND			?= find
-GREP			?= grep
-GZIP			?= gzip
-HEAD			?= head
-INSTALL			?= $(PROJECT_SUPPORTDIR)/scripts/install
-JAR			?= jar
-JAVA			?= java
-LN			?= ln
-M4			?= m4
-MD5SUM			?= md5sum
-MIRROR			?= $(PROJECT_SUPPORTDIR)/scripts/mirror
-MKDIR			?= mkdir
-MV			?= mv
-NICE			?= nice
-PATCH			?= patch
-RECODE			?= recode
-RM			?= rm -f
-SCSH			?= scsh
-SED			?= sed
-SORT			?= sort
-STAT			?= stat
-TAIL			?= tail
-TAR			?= tar
-TOUCH			?= touch
-TR			?= tr
-UNIX2DOS		?= $(RECODE) ..pc
-UNZIP			?= unzip
-WC			?= wc
-XARGS			?= xargs
-ZIP			?= zip
-
-make			?= $(MAKE) MAKELEVEL=$(MAKELEVEL) --no-print-directory
-
-##############################################################################
-# Pico compiler
-
-PICO			?= pico
-PICO_FLAGS		?= -make -source 1.4
-
-##############################################################################
-# Scala tools
-
-SCALA_HOME		?=
-SCALA			?= $(SCALA_HOME:%=%/bin/)scala
-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
-SCALAINFO		?= $(SCALA_HOME:%=%/bin/)scala-info
-
-##############################################################################
-# Convert tool (ImageMagick)
-
-CONVERT			?= convert
-CONVERT_FLAGS		?=
-
-##############################################################################
-# XSLT processor
-
-XSLTPROC		?= xsltproc
-XSLTPROC_FLAGS		?=
-
-##############################################################################
-# InstallAnywhere (http://www.zerog.com/)
-
-IA			?= build
-IA_FLAGS		?=
-
-##############################################################################
-# IzPack (http://www.izforge.com/izpack/)
-
-IZPACK			?= compile
-IZPACK_FLAGS		?= -k standard
-
-##############################################################################
-# Latest files
-
-LATEST_PREFIX		?= .latest
-
-##############################################################################
diff --git a/Makefile.distrib b/Makefile.distrib
deleted file mode 100644
index 40ff0f159b..0000000000
--- a/Makefile.distrib
+++ /dev/null
@@ -1,537 +0,0 @@
-############################################################-*-Makefile-*-####
-# Project Installation and Distribution
-##############################################################################
-# $Id$
-
-# scala documents
-DOCUMENTS_ROOT		 = $(PROJECT_DOCUMENTDIR)
-DOCUMENTS_FILES		+= $(DOCUMENTS_ROOT)/reference/ScalaReference.pdf
-DOCUMENTS_FILES		+= $(DOCUMENTS_ROOT)/reference/ScalaByExample.pdf
-DOCUMENTS_FILES		+= $(DOCUMENTS_ROOT)/tutorial/ScalaTutorial.pdf
-
-# scala examples
-EXAMPLES_ROOT		 = $(PROJECT_SOURCEDIR)/examples
-EXAMPLES_LIST		+= $(call READLIST, $(PROJECT_LISTDIR)/examples.lst)
-EXAMPLES_FILES		 = $(EXAMPLES_LIST:%=$(EXAMPLES_ROOT)/%)
-
-# context hightlighter
-CONTEXT_ROOT		 = $(PROJECT_SUPPORTDIR)/context
-CONTEXT_LIST		+= README
-CONTEXT_LIST		+= Highlighters/Scala.chl
-CONTEXT_LIST		+= Template/Scala.ctpl 
-CONTEXT_FILES		 = $(CONTEXT_LIST:%=$(CONTEXT_ROOT)/%)
-
-# emacs scala-mode
-EMACS_ROOT		 = $(PROJECT_SUPPORTDIR)/emacs
-EMACS_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/emacs.lst)
-EMACS_FILES		 = $(EMACS_LIST:%=$(EMACS_ROOT)/%)
-
-# gedit scala-mode
-GEDIT_ROOT		 = $(PROJECT_SUPPORTDIR)/gedit
-GEDIT_LIST		+= scala.lang
-GEDIT_LIST		+= README
-GEDIT_FILES		 = $(GEDIT_LIST:%=$(GEDIT_ROOT)/%)
-
-# intellij idea scala-mode
-INTELLIJ_ROOT		 = $(PROJECT_SUPPORTDIR)/intellij
-INTELLIJ_LIST		+= scala.xml
-INTELLIJ_LIST		+= README
-INTELLIJ_FILES		 = $(INTELLIJ_LIST:%=$(INTELLIJ_ROOT)/%)
-
-# jedit scala-mode
-JEDIT_ROOT		 = $(PROJECT_SUPPORTDIR)/jedit
-JEDIT_LIST		+= modes/scala.xml
-JEDIT_LIST		+= modes/README
-JEDIT_LIST		+= console/commando/scala.xml
-JEDIT_LIST		+= console/commando/scalac.xml
-JEDIT_LIST		+= console/commando/scalaint.xml
-JEDIT_LIST		+= console/commando/scalarun.xml
-JEDIT_LIST		+= console/README
-JEDIT_FILES		 = $(JEDIT_LIST:%=$(JEDIT_ROOT)/%)
-
-# scite scala-mode
-SCITE_ROOT		 = $(PROJECT_SUPPORTDIR)/scite
-SCITE_LIST		+= scala.properties
-SCITE_LIST		+= README
-SCITE_FILES		 = $(SCITE_LIST:%=$(SCITE_ROOT)/%)
-
-# textpad scala-mode
-TEXTPAD_ROOT		 = $(PROJECT_SUPPORTDIR)/textpad
-TEXTPAD_LIST		+= scala.syn
-TEXTPAD_LIST		+= README
-TEXTPAD_FILES		 = $(TEXTPAD_LIST:%=$(TEXTPAD_ROOT)/%)
-
-# ultraedit scala-mode
-ULTRAEDIT_ROOT		 = $(PROJECT_SUPPORTDIR)/ultraedit
-ULTRAEDIT_LIST		+= scala.txt
-ULTRAEDIT_LIST		+= README
-ULTRAEDIT_FILES		 = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
-
-# vim scala-mode
-VIM_ROOT		 = $(PROJECT_SUPPORTDIR)/vim
-VIM_LIST		+= scala.vim
-VIM_LIST		+= README
-VIM_FILES		 = $(VIM_LIST:%=$(VIM_ROOT)/%)
-
-# xcode scala-mode
-XCODE_ROOT		 = $(PROJECT_SUPPORTDIR)/xcode
-XCODE_LIST		+= README
-XCODE_LIST		+= Specifications/Scala.pbfilespec
-XCODE_LIST		+= Specifications/Scala.pblangspec
-XCODE_FILES		 = $(XCODE_LIST:%=$(XCODE_ROOT)/%)
-
-# scala man pages
-MANPAGES_ROOT		 = $(PROJECT_DOCUMENTDIR)/man/man1
-MANPAGES_LIST		+= scala.1
-MANPAGES_LIST		+= scalac.1
-MANPAGES_LIST		+= scaladoc.1
-MANPAGES_LIST		+= scalaint.1
-MANPAGES_LIST		+= scalarun.1
-MANPAGES_FILES		 = $(MANPAGES_LIST:%=$(MANPAGES_ROOT)/%)
-
-# scala test
-TEST_ROOT		 = $(PROJECT_TESTDIR)
-TEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test.lst)
-TEST_FILES		 = $(TEST_LIST:%=$(TEST_ROOT)/%)
-
-##############################################################################
-# beta versions
-##############################################################################
-
-INSTALL_ROOT		 = $(PROJECT_DISTRIBDIR)
-INSTALL_NAME		 = $(PROJECT_NAME)
-INSTALL_VERSION		:= $(shell $(DATE) -u "+%Y%m%d-%H%M%S")
-INSTALL_PACKAGE		 = $(PROJECT_NAME)-$(INSTALL_VERSION)
-INSTALL_PREFIX		 = $(INSTALL_ROOT)/$(INSTALL_PACKAGE)
-INSTALL_BINDIR		 = $(INSTALL_PREFIX)/bin
-INSTALL_SHAREDIR	 = $(INSTALL_PREFIX)/share
-INSTALL_MANDIR		 = $(INSTALL_SHAREDIR)/man
-INSTALL_DOCDIR		 = $(INSTALL_SHAREDIR)/doc/$(INSTALL_PACKAGE)
-#INSTALL_PACKAGEDIR	 = $(INSTALL_SHAREDIR)/$(INSTALL_PACKAGE)
-INSTALL_PACKAGEDIR	 = $(INSTALL_SHAREDIR)/$(INSTALL_NAME)
-INSTALL_LIBDIR		 = $(INSTALL_PACKAGEDIR)/lib
-INSTALL_SRCDIR		 = $(INSTALL_PACKAGEDIR)/src
-INSTALL_SUPPORTDIR	 = $(INSTALL_PACKAGEDIR)/support
-INSTALL_TESTDIR		 = $(INSTALL_PACKAGEDIR)/test
-INSTALL_APIDOCDIR	 = $(INSTALL_DOCDIR)/api
-INSTALL_EXAMPLEDIR	 = $(INSTALL_DOCDIR)/examples
-
-INSTALL_LIBRARY_JARFILE	 = $(INSTALL_LIBDIR)/$(LIBRARY_NAME).jar
-INSTALL_TOOLS_JARFILE	 = $(INSTALL_LIBDIR)/$(TOOLS_NAME).jar
-INSTALL_FJBG_JARFILE	 = $(INSTALL_LIBDIR)/fjbg.jar
-INSTALL_MSIL_JARFILE	 = $(INSTALL_LIBDIR)/msil.jar
-INSTALL_MSIL_DLLFILE	 = $(INSTALL_LIBDIR)/scala.dll
-
-install			: $(LIBRARY_JAR_ARCHIVE)
-install			: $(TOOLS_JAR_ARCHIVE)
-ifndef SKIP_DOC
-	$(MAKE) -C $(DOCUMENTS_ROOT)/reference
-	$(MAKE) -C $(DOCUMENTS_ROOT)/tutorial
-endif
-	$(INSTALL) -m 755 -d $(INSTALL_DOCDIR)
-	$(INSTALL) -m 644 -p $(PROJECT_ROOT)/README $(INSTALL_DOCDIR)
-	$(INSTALL) -m 644 -p $(PROJECT_ROOT)/LICENSE $(INSTALL_DOCDIR)
-	$(ECHO) $(INSTALL_VERSION) > $(INSTALL_DOCDIR)/VERSION
-	$(CHMOD) 644 $(INSTALL_DOCDIR)/VERSION
-	$(INSTALL) -m 755 -d $(INSTALL_BINDIR)
-	$(INSTALL) -m 644 -p $(SCRIPTS_TEMPLATE_FILE) $(INSTALL_BINDIR)
-	@$(make) \
-	    SCRIPTS_PREFIX=$(INSTALL_PREFIX) \
-	    MACRO_VERSION=$(INSTALL_VERSION) \
-	    MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \
-	    MACRO_LIBRARY_CLASSES=$(INSTALL_LIBRARY_JARFILE) \
-	    MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_JARFILE) \
-	    MACRO_FJBG_CLASSES=$(INSTALL_FJBG_JARFILE) \
-	    MACRO_MSIL_CLASSES=$(INSTALL_MSIL_JARFILE) \
-	    MACRO_JAVA_CMD=java \
-	    MACRO_JAVA_ARGS= \
-	    MACRO_SCALA_CMD=$(INSTALL_BINDIR)/scala \
-	    MACRO_SCALA_ARGS= \
-	    MACRO_TEST_SRCDIR=$(INSTALL_TESTDIR) \
-	    MACRO_TEST_OBJDIR='/tmp/$$$$SCRIPT-$$$$USER' \
-	    MACRO_TEST_ASSEMBLIES= \
-	    scripts
-	$(CHMOD) u+w $(INSTALL_BINDIR)/$(SCRIPTS_WRAPPER_NAME)
-	$(RM) $(INSTALL_BINDIR)/$(SCRIPTS_TEMPLATE_NAME)
-	$(INSTALL) -m 755 -d $(INSTALL_LIBDIR)
-	$(INSTALL) -m 644 -p $(LIBRARY_JAR_ARCHIVE) $(INSTALL_LIBRARY_JARFILE)
-	$(INSTALL) -m 644 -p $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_JARFILE)
-	$(INSTALL) -m 644 -p $(FJBG_JARFILE) $(INSTALL_FJBG_JARFILE)
-	$(INSTALL) -m 644 -p $(MSIL_JARFILE) $(INSTALL_MSIL_JARFILE)
-	$(INSTALL) -m 644 -p $(MSIL_DLLFILE) $(INSTALL_MSIL_DLLFILE)
-	$(INSTALL) -m 755 -d $(INSTALL_SRCDIR)
-	$(strip $(MIRROR) -m 644 -p -C $(LIBRARY_ROOT) $(LIBRARY_LIST:%='%') \
-	    $(INSTALL_SRCDIR)/$(PROJECT_NAME))
-ifndef SKIP_DOC
-	$(INSTALL) -m 755 -d $(INSTALL_DOCDIR)
-	$(INSTALL) -m 644 -p $(DOCUMENTS_FILES) $(INSTALL_DOCDIR)
-endif
-	$(INSTALL) -m 755 -d $(INSTALL_APIDOCDIR)
-	@$(make) \
-	    target=LIBRARY \
-	    main_SCALADOC=$(INSTALL_BINDIR)/scaladoc \
-	    PROJECT_VERSION=$(INSTALL_VERSION) \
-	    PROJECT_SOURCEDIR=$(INSTALL_SRCDIR) \
-	    LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \
-	    sdc
-	$(INSTALL) -m 755 -d $(INSTALL_MANDIR)
-	$(INSTALL) -m 755 -d $(INSTALL_MANDIR)/man1
-	$(strip $(MIRROR) -m 644 -p -C $(MANPAGES_ROOT) $(MANPAGES_LIST) \
-	    $(INSTALL_MANDIR)/man1)
-	$(FIND) $(INSTALL_MANDIR) -type f -exec $(GZIP) -f "{}" ";"
-	$(INSTALL) -m 755 -d $(INSTALL_EXAMPLEDIR)
-	$(strip $(MIRROR) -m 644 -p -C $(EXAMPLES_ROOT) $(EXAMPLES_LIST) \
-	    $(INSTALL_EXAMPLEDIR))
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/context
-	$(strip $(MIRROR) -m 644 -p -C $(CONTEXT_ROOT) $(CONTEXT_LIST) \
-	    $(INSTALL_SUPPORTDIR)/context)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/emacs
-	$(strip $(MIRROR) -m 644 -p -C $(EMACS_ROOT) $(EMACS_LIST) \
-	    $(INSTALL_SUPPORTDIR)/emacs)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/gedit
-	$(strip $(MIRROR) -m 644 -p -C $(GEDIT_ROOT) $(GEDIT_LIST) \
-	    $(INSTALL_SUPPORTDIR)/gedit)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/intellij
-	$(strip $(MIRROR) -m 644 -p -C $(INTELLIJ_ROOT) $(INTELLIJ_LIST) \
-	    $(INSTALL_SUPPORTDIR)/intellij)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/jedit
-	$(strip $(MIRROR) -m 644 -p -C $(JEDIT_ROOT) $(JEDIT_LIST) \
-	    $(INSTALL_SUPPORTDIR)/jedit)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/scite
-	$(strip $(MIRROR) -m 644 -p -C $(SCITE_ROOT) $(SCITE_LIST) \
-	    $(INSTALL_SUPPORTDIR)/scite)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/textpad
-	$(strip $(MIRROR) -m 644 -p -C $(TEXTPAD_ROOT) $(TEXTPAD_LIST) \
-	    $(INSTALL_SUPPORTDIR)/textpad)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/ultraedit
-	$(strip $(MIRROR) -m 644 -p -C $(ULTRAEDIT_ROOT) $(ULTRAEDIT_LIST) \
-	    $(INSTALL_SUPPORTDIR)/ultraedit)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/vim
-	$(strip $(MIRROR) -m 644 -p -C $(VIM_ROOT) $(VIM_LIST) \
-	    $(INSTALL_SUPPORTDIR)/vim)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/xcode
-	$(strip $(MIRROR) -m 644 -p -C $(XCODE_ROOT) $(XCODE_LIST) \
-	    $(INSTALL_SUPPORTDIR)/xcode)
-	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) $(TEST_LIST) \
-	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.args) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.namespace) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-
-install-windows		: install
-	@if [ ! -d "$(INSTALL_PREFIX)" ]; then \
-	    $(ECHO) "Could not find UNIX install '$(INSTALL_PREFIX)'"; \
-	    exit 1; \
-	fi
-	$(UNIX2DOS) $(INSTALL_DOCDIR)/README
-	$(UNIX2DOS) $(INSTALL_DOCDIR)/LICENSE
-	$(UNIX2DOS) $(INSTALL_DOCDIR)/VERSION
-	$(TOUCH) $(INSTALL_DOCDIR)/VERSION-$(INSTALL_VERSION)
-	@root=`cd "$(INSTALL_PREFIX)"; pwd`; \
-	for name in "" $(SCRIPTS_ALIASES_NAMES); do \
-	    if [ -z "$$name" ]; then continue; fi; \
-	    case "$$name" in scala-info* ) continue;; esac; \
-	    case "$$name" in scalatest* ) continue;; esac; \
-	    case "$$name" in scalanstest* ) continue;; esac; \
-	    $(ECHO) -n "Generating $$name.bat ... "; \
-	    srcfile="$(PROJECT_SUPPORTDIR)/windows/scala_wrapper"; \
-	    nixfile="$(INSTALL_PREFIX)/bin/$$name"; \
-	    winfile="$(INSTALL_PREFIX)/bin/$$name.bat"; \
-	    nixexec=`SCALA_JAVA_CMD="echo java" SCALA_CLASSPATH=\"%CLASSPATH%\" $$nixfile`; \
-	    winexec="$$nixexec"; \
-	    winexec=`echo "$$winexec" | sed -es"#$$root#\"%SCALA_HOME%\"#g"`; \
-	    winexec=`echo "$$winexec" | sed -es"#/share/$(INSTALL_NAME)##g"`; \
-	    winexec=`echo "$$winexec" | tr '/' '\\\\' | tr ':' ';'`; \
-	    winexec=`echo "$$winexec" | sed -es"#Xbootclasspath.a;#Xbootclasspath/a:#g"`; \
-	    $(RM) -f "$$winfile"; \
-	    ( \
-	        $(CAT) "$$srcfile-header.bat"; \
-	        $(ECHO) "set VERSION=$(INSTALL_VERSION)"; \
-	        $(ECHO) "set COMMAND=$$winexec"; \
-	        $(CAT) "$$srcfile-footer.bat"; \
-	    ) | $(UNIX2DOS) >> "$$winfile"; \
-	    $(ECHO) "done"; \
-	done; \
-	for name in "" $(SCRIPTS_ALIASES_NAMES); do \
-	    if [ -z "$$name" ]; then continue; fi; \
-	    nixfile="$(INSTALL_PREFIX)/bin/$$name"; \
-	    $(RM) "$$nixfile"; \
-	done
-#	$(RM) $(INSTALL_PREFIX)/bin/.scala_wrapper
-	cygfile="$(INSTALL_PREFIX)/bin/.scala_wrapper"; \
-	cygexec=`$(CAT) "$$cygfile"`; \
-	$(ECHO) "$$cygexec" | $(SED) -es"#/share/$(INSTALL_NAME)##g" > "$$cygfile"
-	$(FIND) $(INSTALL_SRCDIR) -type f -exec $(UNIX2DOS) "{}" ";"
-	$(FIND) $(INSTALL_APIDOCDIR) -type f -exec $(UNIX2DOS) "{}" ";"
-	$(FIND) $(INSTALL_EXAMPLEDIR) -type f -exec $(UNIX2DOS) "{}" ";"
-	$(FIND) $(INSTALL_SUPPORTDIR) -type f -exec $(UNIX2DOS) "{}" ";"
-	$(RM) -r $(INSTALL_TESTDIR)
-	$(MV) $(INSTALL_PACKAGEDIR)/* $(INSTALL_PREFIX)
-	$(INSTALL) -m 755 -d $(INSTALL_PREFIX)/doc
-	$(MV) $(INSTALL_DOCDIR)/api $(INSTALL_PREFIX)/doc
-	$(MV) $(INSTALL_DOCDIR)/*.pdf $(INSTALL_PREFIX)/doc
-	$(MV) $(INSTALL_DOCDIR)/* $(INSTALL_PREFIX)
-	$(RM) -r $(INSTALL_SHAREDIR)
-
-install-addons			:
-	$(RM) -r $(DISTRIB_ARCHIVE).addons
-	$(INSTALL) -d $(DISTRIB_ARCHIVE).addons
-	$(INSTALL) -d $(DISTRIB_ARCHIVE).addons/doc
-	$(INSTALL) $(DOCUMENTS_ROOT)/reference/ScalaRationale.pdf \
-	    $(DISTRIB_ARCHIVE).addons/doc
-	$(INSTALL) $(DOCUMENTS_ROOT)/reference/ProgrammingInScala.pdf \
-	    $(DISTRIB_ARCHIVE).addons/doc
-
-.PHONY			: install
-.PHONY			: install-windows
-.PHONY			: install-addons
-
-##############################################################################
-
-IA_CONFIG_PREFIX	 = $(PROJECT_CONFIGDIR)/ia
-IA_CONFIG_IMAGESDIR	 = $(IA_CONFIG_PREFIX)/images
-IA_CONFIG_LOCALESDIR	 = $(IA_CONFIG_PREFIX)/locales
-IA_CONFIG_CUSTOMCODEDIR	 = $(IA_CONFIG_PREFIX)/CustomCode
-
-IA_XSLFILE		 = $(IA_CONFIG_PREFIX)/setversion.xsl
-IA_CUSTOMFILE	 	 = custom
-IA_LICENSEFILE		 = LICENSE
-IA_SPLASHFILE		 = $(IA_CONFIG_IMAGESDIR)/Splash.png
-
-IA_UNIX_PROJECTFILE	 = $(IA_CONFIG_PREFIX)/$(PROJECT_NAME)_unix.iap_xml
-IA_WIN32_PROJECTFILE	 = $(IA_CONFIG_PREFIX)/$(PROJECT_NAME)_win32.iap_xml
-
-IA_BUILD_PREFIX		 = /tmp/IA_Build_$(PROJECT_NAME)
-IA_BUILD_IMAGESDIR	 = $(IA_BUILD_PREFIX)/images
-IA_BUILD_CUSTOMCODEDIR	 = $(IA_BUILD_PREFIX)/CustomCode
-IA_BUILD_LOCALESDIR	 = $(IA_BUILD_PREFIX)/$(PROJECT_NAME)locales
-IA_BUILD_ARCHIVE_TGZ	 = $(IA_BUILD_PREFIX)/$(PROJECT_NAME).tar.gz
-IA_BUILD_ARCHIVE_ZIP	 = $(IA_BUILD_PREFIX)/$(PROJECT_NAME).zip
-IA_BUILD_PROJECTFILE	 = $(IA_BUILD_PREFIX)/$(PROJECT_NAME).iap_xml
-IA_BUILD_SPLASHFILE	 = $(IA_BUILD_IMAGESDIR)/`$(BASENAME) $(IA_SPLASHFILE)`
-IA_BUILD_OUTPUTDIR	 = $(IA_BUILD_PREFIX)/$(PROJECT_NAME)_Build_Output
-
-IA_INSTALL_PREFIX	 = $(INSTALL_PREFIX).ia
-
-CONVERT_FLAGS		+= -gravity southeast -pointsize 12 -fill red
-CONVERT_FLAGS		+= -family Helvetica
-CONVERT_FLAGS		+= -draw "text 4,4 'v$(INSTALL_VERSION)'"
-
-XSLTPROC_FLAGS		+= --stringparam version "$(INSTALL_VERSION)"
-XSLTPROC_FLAGS		+= $(IA_XSLFILE)
-
-ia-build-common		:
-	$(RM) -r $(IA_BUILD_PREFIX)
-	$(INSTALL) -m 755 -d $(IA_BUILD_PREFIX)
-	$(INSTALL) -m 755 -d $(IA_BUILD_IMAGESDIR)
-	@for file in "" `$(FIND) $(IA_CONFIG_IMAGESDIR)/* -type f`; do \
-	    if [ -z "$$file" ]; then continue; fi; \
-	    $(INSTALL) -m 644 -p "$$file" $(IA_BUILD_IMAGESDIR); \
-	done
-	$(CONVERT) $(CONVERT_FLAGS) $(IA_SPLASHFILE) $(IA_BUILD_SPLASHFILE)
-
-ia-build-unix		:
-	$(INSTALL) -m 755 -d $(IA_BUILD_LOCALESDIR)
-	@for locale in "" `ls -d $(IA_CONFIG_LOCALESDIR)/?? | $(XARGS) -n 1 $(BASENAME)`; do \
-	    if [ -z "$$locale" ]; then continue; fi; \
-	    $(INSTALL) -m 644 -p $(IA_CONFIG_LOCALESDIR)/"$$locale"/$(IA_CUSTOMFILE)_unix \
-	        $(IA_BUILD_LOCALESDIR)/$(IA_CUSTOMFILE)"_$$locale"; \
-	    $(INSTALL) -m 644 -p $(IA_CONFIG_LOCALESDIR)/"$$locale"/$(IA_LICENSEFILE).html \
-	        $(IA_BUILD_PREFIX)/$(IA_LICENSEFILE)"_$$locale".html; \
-	done
-	$(XSLTPROC) $(XSLTPROC_FLAGS) $(IA_UNIX_PROJECTFILE) > $(IA_BUILD_PROJECTFILE)
-	$(TAR) xzf $(INSTALL_PREFIX).tar.gz -C $(IA_BUILD_PREFIX)
-	$(strip cd $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION); \
-	    $(TAR) czf ../$(PROJECT_NAME).tar.gz .)
-	$(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION)
-	$(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE))
-	$(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX)
-	$(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\
-	    $(TAR) xf - -C $(IA_INSTALL_PREFIX))
-	$(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm
-	$(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \
-	    $(IA_INSTALL_PREFIX)/Web_Installers/install-unix.htm)
-
-ia-build-windows	:
-	$(INSTALL) -m 755 -d $(IA_BUILD_CUSTOMCODEDIR)
-	@for file in "" `$(FIND) $(IA_CONFIG_CUSTOMCODEDIR)/*.jar -type f`; do \
-	    if [ -z "$$file" ]; then continue; fi; \
-	    $(INSTALL) -m 644 -p "$$file" $(IA_BUILD_CUSTOMCODEDIR); \
-	done
-	$(INSTALL) -m 755 -d $(IA_BUILD_LOCALESDIR)
-	@for locale in "" `ls -d $(IA_CONFIG_LOCALESDIR)/?? | $(XARGS) -n 1 $(BASENAME)`; do \
-	    if [ -z "$$locale" ]; then continue; fi; \
-	    $(INSTALL) -m 644 -p $(IA_CONFIG_LOCALESDIR)/"$$locale"/$(IA_CUSTOMFILE)_win32 \
-	        $(IA_BUILD_LOCALESDIR)/$(IA_CUSTOMFILE)"_$$locale"; \
-	    $(INSTALL) -m 644 -p $(IA_CONFIG_LOCALESDIR)/"$$locale"/$(IA_LICENSEFILE).html \
-	        $(IA_BUILD_PREFIX)/$(IA_LICENSEFILE)"_$$locale".html; \
-	done
-	$(INSTALL) -m 644 -p $(IA_CONFIG_PREFIX)/tools.zip $(IA_BUILD_PREFIX)
-	$(XSLTPROC) $(XSLTPROC_FLAGS) $(IA_WIN32_PROJECTFILE) > $(IA_BUILD_PROJECTFILE)
-	$(UNZIP) -q $(DISTRIB_ARCHIVE).zip -d $(IA_BUILD_PREFIX)
-	$(strip cd $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION); \
-	    $(ZIP) -q -r ../$(PROJECT_NAME).zip .)
-	$(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION)
-	$(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE))
-	$(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX)
-	$(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\
-	    $(TAR) xf - -C $(IA_INSTALL_PREFIX))
-	$(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm
-	$(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \
-	    $(IA_INSTALL_PREFIX)/Web_Installers/install-windows.htm)
-
-ia-build-all		: ia-build-common
-ia-build-all		: ia-build-unix
-ia-build-all		: ia-build-windows
-ia-build-all		:
-	$(CHMOD) -R a+w $(IA_BUILD_PREFIX)
-
-.PHONY			: ia-build-all
-.PHONY			: ia-build-common
-.PHONY			: ia-build-unix
-.PHONY			: ia-build-windows
-
-##############################################################################
-
-IZPACK_BUILD_PREFIX	 = /tmp/IzPack_Build_$(PROJECT_NAME)
-IZPACK_BUILD_IMAGESDIR	 = $(IZPACK_BUILD_PREFIX)/images
-IZPACK_BUILD_LOCALESDIR	 = $(IZPACK_BUILD_PREFIX)/locales
-IZPACK_BUILD_TARGETSDIR	 = $(IZPACK_BUILD_PREFIX)/targets
-IZPACK_BUILD_PDFDIR	 = $(IZPACK_BUILD_PREFIX)/pdf
-IZPACK_BUILD_UNIXDIR	 = $(IZPACK_BUILD_PREFIX)/unix
-IZPACK_BUILD_WINDIR	 = $(IZPACK_BUILD_PREFIX)/windows
-IZPACK_CONFIG_PREFIX	 = $(PROJECT_CONFIGDIR)/izpack
-IZPACK_OUTPUT_FILE	 = $(DISTRIB_ROOT)/install_$(PROJECT_NAME)-$(INSTALL_VERSION).jar
-IZPACK_SPLASHFILE	 = $(IA_SPLASHFILE)
-
-IZPACK_BUILD_FILE	 = $(IZPACK_BUILD_PREFIX)/izpack_scala.xml
-IZPACK_BUILD_SPLASHFILE	 = $(IZPACK_BUILD_IMAGESDIR)/`$(BASENAME) $(IZPACK_SPLASHFILE)`
-
-izpack-build-all	: $(PROJECT_DISTRIBDIR)/$(INSTALL_PACKAGE).zip
-izpack-build-all	: $(PROJECT_DISTRIBDIR)/$(INSTALL_PACKAGE).tar.gz
-izpack-build-all	:
-	$(RM) -r $(IZPACK_BUILD_PREFIX)
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_TARGETSDIR)
-	$(INSTALL) -m 644 -p $(IZPACK_CONFIG_PREFIX)/targets/*.txt $(IZPACK_BUILD_TARGETSDIR)
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_LOCALESDIR)
-	@for locale in "" `ls -d $(IA_CONFIG_LOCALESDIR)/?? | $(XARGS) -n 1 $(BASENAME)`; do \
-	    if [ -z "$$locale" ]; then continue; fi; \
-	    $(INSTALL) -m 644 -p $(IA_CONFIG_LOCALESDIR)/"$$locale"/$(IA_LICENSEFILE).html \
-	        $(IZPACK_BUILD_LOCALESDIR)/$(IA_LICENSEFILE)"_$$locale".html; \
-	done
-	$(INSTALL) -m 644 -p $(IZPACK_CONFIG_PREFIX)/locales/*.html $(IZPACK_BUILD_LOCALESDIR)
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_IMAGESDIR)
-	$(INSTALL) -m 644 -p $(IZPACK_CONFIG_PREFIX)/images/*.png $(IZPACK_BUILD_IMAGESDIR)
-	$(CONVERT) $(CONVERT_FLAGS) $(IZPACK_SPLASHFILE) $(IZPACK_BUILD_SPLASHFILE)
-
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_UNIXDIR)
-	$(TAR) xzf $(INSTALL_PREFIX).tar.gz -C $(IZPACK_BUILD_UNIXDIR)
-	$(strip cd $(IZPACK_BUILD_UNIXDIR)/$(PROJECT_NAME)-$(INSTALL_VERSION); \
-	    $(RM) -r share/$(PROJECT_NAME)-$(INSTALL_VERSION)/lib; \
-	    $(RM) -r share/doc/$(PROJECT_NAME)-$(INSTALL_VERSION)/*.pdf; \
-	    $(MV) * ..)
-	$(RM) -r $(IZPACK_BUILD_UNIXDIR)/$(PROJECT_NAME)-$(INSTALL_VERSION)
-
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_WINDIR)
-	$(UNZIP) -q $(DISTRIB_ARCHIVE).zip -d $(IZPACK_BUILD_WINDIR)
-	$(strip cd $(IZPACK_BUILD_WINDIR)/$(PROJECT_NAME)-$(INSTALL_VERSION); \
-	    $(MV) * ..)
-	$(RM) -r $(IZPACK_BUILD_WINDIR)/$(PROJECT_NAME)-$(INSTALL_VERSION)
-	$(MV) $(IZPACK_BUILD_WINDIR)/lib $(IZPACK_BUILD_PREFIX)
-
-	$(INSTALL) -m 755 -d $(IZPACK_BUILD_PDFDIR)
-	$(MV) $(IZPACK_BUILD_WINDIR)/doc/*.pdf $(IZPACK_BUILD_PDFDIR)
-
-	$(INSTALL) -m 644 -p $(IZPACK_CONFIG_PREFIX)/*.xml $(IZPACK_BUILD_PREFIX)
-	$(INSTALL) -m 700 -p $(IZPACK_CONFIG_PREFIX)/*.sh $(IZPACK_BUILD_PREFIX)
-	$(IZPACK) $(call CYGWIN_FILE,$(IZPACK_BUILD_FILE)) \
-	  -b $(call CYGWIN_FILE,$(IZPACK_BUILD_PREFIX)) \
-	  -o $(call CYGWIN_FILE,$(IZPACK_OUTPUT_FILE)) -k standard
-
-.PHONY			: izpack-build-all
-
-##############################################################################
-
-DISTRIB_ROOT		 = $(PROJECT_DISTRIBDIR)
-DISTRIB_PACKAGE		 = $(INSTALL_PACKAGE)
-DISTRIB_ARCHIVE		 = $(DISTRIB_ROOT)/$(DISTRIB_PACKAGE)
-DISTRIB_GENMD5		 = cd $(dir $(1)); $(MD5SUM) $(notdir $(1)) > $(notdir $(1)).md5
-
-distrib			: distrib-build-all
-	$(RM) -rf $(INSTALL_PREFIX)
-
-distrib-build-all	: distrib-build-unix
-distrib-build-all	: distrib-build-windows
-distrib-build-all	: distrib-build-ia
-distrib-build-all	: distrib-build-addons
-
-distrib-build-unix	: install
-	$(RM) $(DISTRIB_ARCHIVE).tar
-	$(RM) $(DISTRIB_ARCHIVE).tar.gz
-	$(RM) $(DISTRIB_ARCHIVE).tar.bz2
-	$(strip $(TAR) cf $(DISTRIB_ARCHIVE).tar -C $(dir $(INSTALL_PREFIX)) \
-	    $(notdir $(INSTALL_PREFIX)))
-	$(BZIP2) --best -c $(DISTRIB_ARCHIVE).tar > $(DISTRIB_ARCHIVE).tar.bz2
-	$(GZIP) --best -c $(DISTRIB_ARCHIVE).tar > $(DISTRIB_ARCHIVE).tar.gz
-	$(call DISTRIB_GENMD5,$(DISTRIB_ARCHIVE).tar.bz2)
-	$(call DISTRIB_GENMD5,$(DISTRIB_ARCHIVE).tar.gz)
-	$(RM) $(DISTRIB_ARCHIVE).tar
-
-distrib-build-windows	: install-windows
-	@$(call RUN,cd $(dir $(INSTALL_PREFIX))); \
-	$(call RUN,$(RM) $(DISTRIB_PACKAGE).zip); \
-	$(call RUN,$(ZIP) -q -r $(DISTRIB_PACKAGE).zip \
-	    $(notdir $(INSTALL_PREFIX)))
-	@archive=$(dir $(INSTALL_PREFIX))/$(DISTRIB_PACKAGE).zip; \
-	if [ ! $(DISTRIB_ARCHIVE).zip -ef $$archive ]; then \
-	    $(call RUN,$(RM) $(DISTRIB_ARCHIVE).zip); \
-	    $(call RUN,$(CP) $(dir $(INSTALL_PREFIX))/$(DISTRIB_PACKAGE).zip \
-	        $(DISTRIB_ARCHIVE).zip); \
-	fi
-	$(call DISTRIB_GENMD5,$(DISTRIB_ARCHIVE).zip)
-
-distrib-build-ia	: ia-build-all
-
-distrib-build-izpack	: izpack-build-all
-
-distrib-build-addons	: install-addons
-
-distrib-izpack		: distrib-build-izpack
-
-distrib-official	: version-update
-	@$(make) -C doc/tutorial distclean
-	@$(make) -C doc/reference distclean
-	@$(make) distclean
-	@$(make) all
-	@$(make) -C doc/reference all
-	@$(make) -C doc/tutorial all
-	@$(make) test
-	@$(make) distrib INSTALL_VERSION='$$(PROJECT_VERSION)'
-#	$(CVS) tag "release-$(subst .,_,$(PROJECT_VERSION))" $(PROJECT_ROOT)
-	@$(make) version-increment
-
-.PHONY			: distrib
-.PHONY			: distrib-build-all
-.PHONY			: distrib-build-unix
-.PHONY			: distrib-build-windows
-.PHONY			: distrib-build-ia
-.PHONY			: distrib-build-izpack
-.PHONY			: distrib-build-website
-.PHONY			: distrib-izpack
-.PHONY			: distrib-official
-
-##############################################################################
diff --git a/Makefile.examples b/Makefile.examples
deleted file mode 100644
index c3eb88b561..0000000000
--- a/Makefile.examples
+++ /dev/null
@@ -1,124 +0,0 @@
-############################################################-*-Makefile-*-####
-# Makefile for the Scala Examples
-##############################################################################
-# $Id$
-
-##############################################################################
-# Configuration
-
-ROOT			 = .
-
-##############################################################################
-# Variables
-
-SCALA_HOME		 = $(ROOT)
-
-PACKAGE_DIR		 = examples
-SOURCE_DIR		 = $(ROOT)/sources
-OUTPUT_DIR		 = $(ROOT)/classes
-
-SCALA_FILES		+= computeserver
-SCALA_FILES		+= auction
-SCALA_FILES		+= boundedbuffer
-SCALA_FILES		+= oneplacebuffer
-SCALA_FILES		+= fors
-SCALA_FILES		+= futures
-SCALA_FILES		+= iterators
-SCALA_FILES		+= maps
-SCALA_FILES		+= Parsers
-SCALA_FILES		+= parsers1
-SCALA_FILES		+= parsers2
-SCALA_FILES		+= patterns
-SCALA_FILES		+= sort
-SCALA_FILES		+= sort1
-SCALA_FILES		+= sort2
-#SCALA_FILES		+= typeinf
-SCALA_FILES		+= expressions/expressions-current
-#SCALA_FILES		+= jolib/Ref
-#SCALA_FILES		+= jolib/parallelOr
-SCALA_FILES		+= pilib/elasticBuffer
-SCALA_FILES		+= pilib/handover
-SCALA_FILES		+= pilib/mobilePhoneProtocol
-SCALA_FILES		+= pilib/rwlock
-SCALA_FILES		+= pilib/scheduler
-SCALA_FILES		+= pilib/semaphore
-SCALA_FILES		+= pilib/twoPlaceBuffer
-SCALA_FILES		+= pilib/piNat
-
-SCALA_SOURCES		+= $(SCALA_FILES:%=$(SOURCE_DIR)/$(PACKAGE_DIR)/%.scala)
-
-SCALAC			?= $(SCALA_HOME)/bin/scalac
-SCALAC_OPTIONS		+= -d $(call CYGWIN_PATH,$(OUTPUT_DIR))
-
-SCALA			?= $(SCALA_HOME)/bin/scala
-SCALA_OPTIONS		+= -cp $(call CYGWIN_PATH,$(OUTPUT_DIR))
-
-SCALAP			?= $(SCALA_HOME)/bin/scalap
-SCALAP_OPTIONS		+= -classpath $(call CYGWIN_PATH,$(OUTPUT_DIR))
-
-##############################################################################
-
-ECHO			 = echo
-FIND			 = find
-GREP			 = grep
-MKDIR			 = mkdir
-RM			 = rm -f
-RUN                      = $(ECHO) '$(1)'; $(1) || exit $$?
-SED			 = sed
-TOUCH			 = touch
-
-CYGWIN_TEST		 = $(filter CYGWIN%,$(shell $(UNAME)))
-CYGWIN_PATH		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w -p $(1)`,$(1))
-CYGWIN_FILE		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w    $(1)`,$(1))
-
-##############################################################################
-# Commands
-
-help:
-	@$(ECHO) "Usage: make -f Makefile.examples [ option ]"
-	@$(ECHO) "  all                      generate class files for all examples"
-	@$(ECHO) "  build [ FILES=<files> ]  generate class files for FILES or all"
-	@$(ECHO) "                           examples if parameter FILES is omitted"
-	@$(ECHO) "  clean                    remove all generated class files"
-	@$(ECHO) "  help                     display this usage message"
-	@$(ECHO) "  run [ MAIN=<main> ]      execute the Scala program MAIN or all"
-
-all: .latest-examples-build
-
-build:
-	@if [ -z "$(FILES)" ]; then \
-	    $(MAKE) -f Makefile.examples all; \
-	else \
-	    $(call RUN,$(SCALAC) $(SCALAC_OPTIONS) $(FILES)); \
-	fi
-
-run: build
-	@if [ -z "$(MAIN)" ]; then \
-	    classes=`cd $(OUTPUT_DIR) && $(FIND) . -name "*.class" | $(GREP) -v '\\$$'`; \
-	    classes=`$(ECHO) "$$classes" | $(SED) -e "s#./##" -e "s#.class##g" -e "s#/#.#g"`; \
-	    for class in $$classes; do \
-	        hasMain=`$(SCALAP) $(SCALAP_OPTIONS) $$class | $(GREP) -c "final def main("`; \
-	        [ $$hasMain -gt 0 ] && $(SCALA) $(SCALA_OPTIONS) $$class; \
-	    done; \
-	else \
-	    $(call RUN,$(SCALA) $(SCALA_OPTIONS) $(MAIN)); \
-	fi
-
-clean:
-	$(RM) -r .latest-examples* $(OUTPUT_DIR)/$(PACKAGE_DIR)
-
-.PHONY: all
-.PHONY: build
-.PHONY: clean
-.PHONY: help
-.PHONY: run
-
-##############################################################################
-# Targets
-
-.latest-examples-build: $(SCALA_SOURCES)
-	@[ -d "$(OUTPUT_DIR)/$(PACKAGE_DIR)" ] || $(MKDIR) -p $(OUTPUT_DIR)/$(PACKAGE_DIR)
-	$(SCALAC) $(SCALAC_OPTIONS) $(SCALA_SOURCES)
-	@$(TOUCH) $@
-
-##############################################################################
diff --git a/Makefile.import b/Makefile.import
deleted file mode 100644
index 61a65e4ec4..0000000000
--- a/Makefile.import
+++ /dev/null
@@ -1,36 +0,0 @@
-############################################################-*-Makefile-*-####
-# Project Imports
-##############################################################################
-# $Id$
-
-##############################################################################
-# Read configuration
-
-include $(ROOT)/Makefile.config
-
-##############################################################################
-# Variables
-
-# project
-PROJECT_VERSION		 = $(shell $(TAIL) -1 $(VERSION_FILE))
-
-# version management
-VERSION_FILE		 = $(PROJECT_ROOT)/VERSION
-VERSION_SCRIPT		 = $(PROJECT_SUPPORTDIR)/scripts/version-manager
-
-##############################################################################
-# Makefile functions
-
-RUN			 = $(ECHO) '$(1)'; $(1) || exit $$?
-READLIST		 = $(shell $(CAT) $(1) | $(GREP) -v "^\#")
-
-##############################################################################
-# Includes
-
-include $(PROJECT_SUPPORTDIR)/make/default.mk
-include $(PROJECT_SUPPORTDIR)/make/cygwin.mk
-include $(PROJECT_SUPPORTDIR)/make/exec.mk
-include $(PROJECT_SUPPORTDIR)/make/grep.mk
-include $(PROJECT_SUPPORTDIR)/make/wc.mk
-
-##############################################################################
diff --git a/sources/scala/Function.scala.tmpl b/sources/scala/Function.scala.tmpl
deleted file mode 100644
index 83d0c99c27..0000000000
--- a/sources/scala/Function.scala.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2004, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala;
-
-trait Function{#n#}{#ClassSignature#} extends AnyRef {
-  def apply{#ApplySignature#};
-}
diff --git a/sources/scala/Tuple.scala.tmpl b/sources/scala/Tuple.scala.tmpl
deleted file mode 100644
index 54c75728f4..0000000000
--- a/sources/scala/Tuple.scala.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala;
-
-case class Tuple{#n#}[{#TParams#}]({#VParams#}) {
-  override def toString(): String = "(" + {#ToStringBody#} + ")";
-}
diff --git a/sources/scala/Tuple.scm b/sources/scala/Tuple.scm
deleted file mode 100644
index 081690b08b..0000000000
--- a/sources/scala/Tuple.scm
+++ /dev/null
@@ -1,49 +0,0 @@
-;; This rule file defines the environment for the expansion of
-;; Tuple.tmpl template.
-;;
-;; It defines the following variables:
-;;
-;;   Name          Meaning                Value for Tuple2
-;;   -----------------------------------------------------
-;;   n             Arity of the tuple     2
-;;   type-params   Type parameters        [T1, T2]
-;;   value-params  Value parameters       _1: T1, _2: T2
-;;   equal         Equality test          (_1 == that._1) && (_2 == that._2)
-;;   hash-code     Body of hashCode()     _1.hashCode() ^ _2.hashCode()
-;;   to-string     Body of toString()     "(" + _1 + "," + _2 + ")"
-
-(define (repeated-string f n sep)
-  (string-join (map f (list-tabulate n (lambda (x) (+ x 1)))) sep))
-
-(define (make-type-params n)
-  (string-append "[" (repeated-string (lambda (i) (format #f "T~a" i)) n ", ") "]"))
-
-(define (make-value-params n)
-  (repeated-string (lambda (i) (format #f "_~a: T~a" i i)) n ", "))
-
-(define (make-equal n)
-  (repeated-string (lambda (i) (format #f "(_~a == that._~a)" i i)) n " && "))
-
-(define (make-hash-code n)
-  (repeated-string (lambda (i) (format #f "_~a.hashCode()" i)) n " ^ "))
-
-(define (make-to-string n)
-  (string-append
-   "\"(\" + "
-   (repeated-string (lambda (i) (format #f "_~a" i)) n " + \",\" + ")
-   " + \")\""))
-
-(define file-name-rx (rx "Tuple" (submatch (+ digit)) ".scala"))
-
-(define (make-env target-file)
-  (let ((match (regexp-search file-name-rx target-file)))
-    (if match
-        (let ((n (string->number (match:substring match 1))))
-          (list (cons 'n (number->string n))
-                (cons 'type-params (make-type-params n))
-                (cons 'value-params (make-value-params n))
-                (cons 'equal (make-equal n))
-                (cons 'hash-code (make-hash-code n))
-                (cons 'to-string (make-to-string n))))
-        (error "invalid file name" target-file))))
-
diff --git a/sources/scala/Tuple.tmpl b/sources/scala/Tuple.tmpl
deleted file mode 100644
index 59170a251d..0000000000
--- a/sources/scala/Tuple.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-// [#do-not-edit#]
-
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala {
-  case class Tuple[#n#][#type-params#]([#value-params#]) extends scala.Object {
-
-    override def hashCode() = [#hash-code#];
-
-    override def equals (other: Any) =
-      if (other is Tuple[#n#][#type-params#]) {
-	val that = other as Tuple[#n#][#type-params#];
-	[#equal#]
-      } else false;
-
-    override def toString() = [#to-string#];
-  }
-}