diff options
| author | mihaylov <mihaylov@epfl.ch> | 2004-06-04 16:06:33 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2004-06-04 16:06:33 +0000 |
| commit | 940f327765c9a0cf23684ecfc9c922a166938789 (patch) | |
| tree | 0d35903ed72a41410250dc754a1bbe13c2038e1e /Makefile | |
| parent | d2fbc9ec5a2a106d3d1612c97c06d2f40a099809 (diff) | |
| download | scala-940f327765c9a0cf23684ecfc9c922a166938789.tar.gz scala-940f327765c9a0cf23684ecfc9c922a166938789.tar.bz2 scala-940f327765c9a0cf23684ecfc9c922a166938789.zip | |
- maintain a separate list of files for the lib...
- maintain a separate list of files for the library-msil target
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -96,10 +96,13 @@ SCALAC_SCALAC = $(LIBRARY_SCALAC) # scala library LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) +LIBRARY_MSIL_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library-msil.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) +LIBRARY_MSIL_SOURCES += $(LIBRARY_MSIL_LIST:%=$(LIBRARY_ROOT)/%) LIBRARY_JC_FILES += $(filter %.java,$(LIBRARY_SOURCES)) LIBRARY_JC_FLAGS += $(JC_FLAGS) -scala-hack LIBRARY_SC_FILES += $(filter %.scala,$(LIBRARY_SOURCES)) +LIBRARY_MSIL_SC_FILES += $(filter %.scala,$(LIBRARY_MSIL_SOURCES)) LIBRARY_SC_BOOTCLASSPATH = $(PROJECT_OUTPUTDIR):$(PROJECT_SOURCEDIR):$(JRE_JARFILE) LIBRARY_SDC_FLAGS += -windowtitle "Scala Library Documentation" LIBRARY_SDC_FLAGS += -doctitle "Scala<br/>$(PROJECT_VERSION)" @@ -235,7 +238,7 @@ bootstrap : .latest-bootstrap scripts : $(SCRIPTS_WRAPPER_LINKS) library : .latest-$(boot)library-jc library : .latest-$(boot)library-sc -library-msil : .latest-$(boot)library-sc-msil +library-msil : .latest-$(boot)library-msil-sc util : .latest-$(boot)util-jc util : .latest-$(boot)util-sc scalac : .latest-$(boot)scalac-jc @@ -376,11 +379,11 @@ cvs-fix-perms : @$(make) sc target=LIBRARY LIBRARY_SC_FILES='$(subst $$,$$$$,$?)' touch $@ -.latest-$(boot)library-sc-msil : $(LIBRARY_SC_FILES) - @$(make) sc target=LIBRARY SC_TARGET="msil"\ +.latest-$(boot)library-msil-sc : $(LIBRARY_MSIL_SC_FILES) + @$(make) sc target=LIBRARY_MSIL SC_TARGET="msil"\ LIBRARY_SCALAC=$(PROJECT_BINARYDIR)/scalac \ - SC_FLAGS="-r $(PROJECT_LIBRARYDIR)" \ - LIBRARY_SC_FILES='$(subst $$,$$$$,$?)' + SC_FLAGS="-uniqid -r $(PROJECT_LIBRARYDIR) -o scalalibx -g" \ + LIBRARY_MSIL_SC_FILES='$(subst $$,$$$$,$?)' touch $@ .latest-library-sdc : $(LIBRARY_SDC_FILES) |