diff options
| author | paltherr <paltherr@epfl.ch> | 2004-07-20 17:27:58 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-07-20 17:27:58 +0000 |
| commit | 62bde3133513e01c53a6850b651041c9294e99aa (patch) | |
| tree | 0e248d2fe382460ee4d43aef415184b456cd85ae /Makefile | |
| parent | 96d69778b6c1bd6c554d3efa065655912e12f4d4 (diff) | |
| download | scala-62bde3133513e01c53a6850b651041c9294e99aa.tar.gz scala-62bde3133513e01c53a6850b651041c9294e99aa.tar.bz2 scala-62bde3133513e01c53a6850b651041c9294e99aa.zip | |
- merged compiler.lst into scalac.lst
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -17,7 +17,6 @@ include $(ROOT)/Makefile.import PROJECT_SOURCES += $(LAMPLIB_SOURCES) PROJECT_SOURCES += $(META_SOURCES) PROJECT_SOURCES += $(UTIL_SOURCES) -PROJECT_SOURCES += $(SCALACBOOT_SOURCES) PROJECT_SOURCES += $(SCALAC_SOURCES) PROJECT_SOURCES += $(LIBRARY_SOURCES) PROJECT_SOURCES += $(INTERPRETER_SOURCES) @@ -77,18 +76,13 @@ UTIL_SC_FILES += $(filter %.scala,$(UTIL_SOURCES)) UTIL_SC_BOOTCLASSPATH = $(LIBRARY_SC_BOOTCLASSPATH) UTIL_SCALAC = $(LIBRARY_SCALAC) -# scala boot compiler -SCALACBOOT_ROOT = $(PROJECT_SOURCEDIR)/scalac -SCALACBOOT_LIST += $(call READLIST,$(PROJECT_LISTDIR)/compiler.lst) -SCALACBOOT_SOURCES += $(SCALACBOOT_LIST:%=$(SCALACBOOT_ROOT)/%) - # scala compiler SCALAC_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalac SCALAC_LIST += $(call READLIST,$(PROJECT_LISTDIR)/scalac.lst) SCALAC_SOURCES += $(SCALAC_LIST:%=$(SCALAC_ROOT)/%) -SCALAC_JC_FILES += $(SCALACBOOT_SOURCES) +SCALAC_JC_FILES += $(filter %.java,$(SCALAC_SOURCES)) SCALAC_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) -SCALAC_SC_FILES += $(SCALAC_SOURCES) +SCALAC_SC_FILES += $(filter %.scala,$(SCALAC_SOURCES)) SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH) SCALAC_SC_BOOTCLASSPATH = $(LIBRARY_SC_BOOTCLASSPATH) SCALAC_SCALAC = $(LIBRARY_SCALAC) |