summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2005-05-23 08:25:37 +0000
committerpaltherr <paltherr@epfl.ch>2005-05-23 08:25:37 +0000
commit242b37e9b8798bdaade40b154a6959b37e9d2c8c (patch)
treee32b1070807b67d09744cd833c973d7c142522fe /Makefile
parentd9e3c133db4f7b57fe6d4d735d9ae687d29484cb (diff)
downloadscala-242b37e9b8798bdaade40b154a6959b37e9d2c8c.tar.gz
scala-242b37e9b8798bdaade40b154a6959b37e9d2c8c.tar.bz2
scala-242b37e9b8798bdaade40b154a6959b37e9d2c8c.zip
- Removed "scalac", "scalai" and "scaladoc" fro...
- Removed "scalac", "scalai" and "scaladoc" from tnsc
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index adff8e8157..de0ec7ff1c 100644
--- a/Makefile
+++ b/Makefile
@@ -274,7 +274,6 @@ ifeq ($(prefix),tnsc)
$(latest)all : $(latest)lamplib
$(latest)all : $(latest)library
$(latest)all : $(latest)tools
-$(latest)all : $(latest)nsc
endif
$(latest)all :
@@ -692,10 +691,13 @@ TOOLS_JAR_FILES += .
$(latest)tools : $(latest)lamplib
$(latest)tools : $(latest)util
+ifneq ($(prefix),tnsc)
$(latest)tools : $(latest)scalac
-#$(latest)tools : $(latest)nsc
$(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