diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -79,7 +79,7 @@ COMPILER_ROOT = $(PROJECT_SOURCEDIR)/scalac COMPILER_LIST = $(call READLIST,$(PROJECT_LISTDIR)/compiler.lst) COMPILER_SOURCES += $(COMPILER_LIST:%=$(COMPILER_ROOT)/%) COMPILER_JC_FILES = $(filter %.java,$(COMPILER_SOURCES)) -COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(BCEL_JARFILE):$(MSIL_JARFILE):$(FJBG_JARFILE) +COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) COMPILER_SC_FILES = $(filter %.scala,$(COMPILER_SOURCES)) COMPILER_SC_CLASSPATH = $(COMPILER_JC_CLASSPATH) COMPILER_SCALAC = $(PROJECT_BOOTSTRAPDIR)/bin/scalac @@ -353,7 +353,6 @@ $(SCRIPTS_WRAPPER) : MACRO_VERSION ?= $(PROJECT_VERSION) $(SCRIPTS_WRAPPER) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR) $(SCRIPTS_WRAPPER) : MACRO_RUNTIME_CLASSES ?= $(PROJECT_OUTPUTDIR) $(SCRIPTS_WRAPPER) : MACRO_TOOLS_CLASSES ?= $(PROJECT_OUTPUTDIR) -$(SCRIPTS_WRAPPER) : MACRO_BCEL_CLASSES ?= $(BCEL_JARFILE) $(SCRIPTS_WRAPPER) : MACRO_FJBG_CLASSES ?= $(FJBG_JARFILE) $(SCRIPTS_WRAPPER) : MACRO_MSIL_CLASSES ?= $(MSIL_JARFILE) $(SCRIPTS_WRAPPER) : MACRO_JAVA_ARGS ?= -enableassertions @@ -369,7 +368,6 @@ $(SCRIPTS_WRAPPER) : $(SCRIPTS_WRAPPER).tmpl $(call SCRIPTS_WRAPPER_MACRO,RUNTIME_SOURCES) \ $(call SCRIPTS_WRAPPER_MACRO,RUNTIME_CLASSES) \ $(call SCRIPTS_WRAPPER_MACRO,TOOLS_CLASSES) \ - $(call SCRIPTS_WRAPPER_MACRO,BCEL_CLASSES) \ $(call SCRIPTS_WRAPPER_MACRO,FJBG_CLASSES) \ $(call SCRIPTS_WRAPPER_MACRO,MSIL_CLASSES) \ $(call SCRIPTS_WRAPPER_MACRO,JAVA_ARGS) \ |