diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-15 17:00:54 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-15 17:00:54 +0000 |
| commit | 5f09d8f587efd305fae640a89ba97b9319d90db4 (patch) | |
| tree | b6b92a16eb0af29ae039e5f0e25868cd06842b9b /Makefile | |
| parent | eed5ff3582546afc17f2f7ed0c5ec99a0f642c6d (diff) | |
| download | scala-5f09d8f587efd305fae640a89ba97b9319d90db4.tar.gz scala-5f09d8f587efd305fae640a89ba97b9319d90db4.tar.bz2 scala-5f09d8f587efd305fae640a89ba97b9319d90db4.zip | |
- Made context variables context indenpendent
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 15 insertions, 9 deletions
@@ -20,15 +20,17 @@ latest = $(LATEST_PREFIX)-$(prefix)- meta_PREFIX = meta meta_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(meta_PREFIX) meta_JC_OUTPUTDIR = $(meta_OBJECTDIR)/classes -meta_JC_CLASSPATH = $(JC_OUTPUTDIR) +meta_JC_CLASSPATH = $(meta_JC_OUTPUTDIR) meta_SCALAC = $(SCALAC) boot_PREFIX = boot boot_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(boot_PREFIX) boot_INSTALLDIR = $(boot_OBJECTDIR) boot_BINARYDIR = $(boot_OBJECTDIR)/bin -boot_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) -boot_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) +boot_LIBRARY_CLASSDIR = $(boot_OBJECTDIR)/library +boot_TOOLS_CLASSDIR = $(boot_OBJECTDIR)/tools +boot_JC_OUTPUTDIR = $(boot_TOOLS_CLASSDIR) +boot_JC_CLASSPATH = $(boot_JC_OUTPUTDIR):$(boot_LIBRARY_CLASSDIR) boot_SCALAC = $(SCALAC) boot_SCALADOC = $(SCALADOC) @@ -36,8 +38,10 @@ main_PREFIX = main main_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(main_PREFIX) main_INSTALLDIR = $(PROJECT_ROOT) main_BINARYDIR = $(PROJECT_BINARYDIR) -main_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) -main_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) +main_LIBRARY_CLASSDIR = $(main_OBJECTDIR)/library +main_TOOLS_CLASSDIR = $(main_OBJECTDIR)/tools +main_JC_OUTPUTDIR = $(main_TOOLS_CLASSDIR) +main_JC_CLASSPATH = $(main_JC_OUTPUTDIR):$(main_LIBRARY_CLASSDIR) main_SCALAC = $(boot_BINARYDIR)/scalac main_SCALADOC = $(main_BINARYDIR)/scaladoc @@ -45,8 +49,10 @@ test_PREFIX = test test_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(test_PREFIX) test_INSTALLDIR = $(test_OBJECTDIR) test_BINARYDIR = $(test_OBJECTDIR)/bin -test_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) -test_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) +test_LIBRARY_CLASSDIR = $(test_OBJECTDIR)/library +test_TOOLS_CLASSDIR = $(test_OBJECTDIR)/tools +test_JC_OUTPUTDIR = $(test_TOOLS_CLASSDIR) +test_JC_CLASSPATH = $(test_JC_OUTPUTDIR):$(test_LIBRARY_CLASSDIR) test_SCALAC = $(main_BINARYDIR)/scalac test_SCALADOC = $(test_BINARYDIR)/scaladoc @@ -378,7 +384,7 @@ PROJECT_SOURCES += $(LIBRARY_SOURCES) LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) -LIBRARY_CLASSDIR = $($(prefix)_OBJECTDIR)/library +LIBRARY_CLASSDIR = $($(prefix)_LIBRARY_CLASSDIR) LIBRARY_JC_FILES += $(filter %.java,$(LIBRARY_SOURCES)) LIBRARY_JC_FLAGS += $(JC_FLAGS) -scala-hack LIBRARY_JC_OUTPUTDIR = $(LIBRARY_CLASSDIR) @@ -640,7 +646,7 @@ $(latest)servlet-sc : $(SERVLET_SC_FILES) # Targets - scala tools TOOLS_NAME = tools -TOOLS_CLASSDIR = $($(prefix)_OBJECTDIR)/tools +TOOLS_CLASSDIR = $($(prefix)_TOOLS_CLASSDIR) TOOLS_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(TOOLS_NAME).jar TOOLS_JAR_INPUTDIR = $(TOOLS_CLASSDIR) TOOLS_JAR_FILES += ch |