diff options
| author | paltherr <paltherr@epfl.ch> | 2003-08-18 16:50:08 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-08-18 16:50:08 +0000 |
| commit | b7dd9ed9a234211df2eb592ce96b1f7de9d88165 (patch) | |
| tree | 6e2f614ceafea205a1e97725444e042bea7df76a | |
| parent | 87210b8f1092065be1b7cfaf13a3852fe861abe4 (diff) | |
| download | scala-b7dd9ed9a234211df2eb592ce96b1f7de9d88165.tar.gz scala-b7dd9ed9a234211df2eb592ce96b1f7de9d88165.tar.bz2 scala-b7dd9ed9a234211df2eb592ce96b1f7de9d88165.zip | |
- made some makefile scripts a bit more robust ...
- made some makefile scripts a bit more robust to filenames containing
- $s reenabled generation of scala documentation
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | support/make/cygwin.mk | 4 | ||||
| -rw-r--r-- | support/make/grep.mk | 2 | ||||
| -rw-r--r-- | support/make/jc.mk | 2 | ||||
| -rw-r--r-- | support/make/sc.mk | 2 | ||||
| -rw-r--r-- | support/make/sdc.mk | 2 | ||||
| -rw-r--r-- | support/make/wc.mk | 2 |
7 files changed, 11 insertions, 11 deletions
@@ -130,7 +130,7 @@ all : library all : interpreter all : scaladoc all : dtd2scala -#all : library-doc +all : library-doc force : fastclean @$(make) all @@ -208,15 +208,15 @@ library-doc : .latest-library-sdc touch $@ .latest-library-jc : $(LIBRARY_JC_FILES) - @$(make) jc target=LIBRARY LIBRARY_JC_FILES='$?' + @$(make) jc target=LIBRARY LIBRARY_JC_FILES='$(subst $$,$$$$,$?)' touch $@ .latest-library-sc : $(LIBRARY_SC_FILES) - @$(make) sc target=LIBRARY LIBRARY_SC_FILES='$(subst $$,\$$$$,$?)' + @$(make) sc target=LIBRARY LIBRARY_SC_FILES='$(subst $$,$$$$,$?)' touch $@ .latest-library-sdc : $(LIBRARY_SDC_FILES) - @$(make) sdc target=LIBRARY LIBRARY_SDC_FILES='$(subst $$,\$$$$,$(LIBRARY_SDC_FILES))' + @$(make) sdc target=LIBRARY touch $@ .latest-interpreter : $(INTERPRETER_JC_FILES) diff --git a/support/make/cygwin.mk b/support/make/cygwin.mk index 5b13f6b14b..2fc301ea09 100644 --- a/support/make/cygwin.mk +++ b/support/make/cygwin.mk @@ -26,7 +26,7 @@ CYGWIN_TEST = $(filter CYGWIN%,$(shell $(UNAME))) ############################################################################## # Functions -CYGWIN_PATH = $(if $(CYGWIN_TEST),`$(CYGPATH) -w -p '$(1)'`,$(1)) -CYGWIN_FILE = $(if $(CYGWIN_TEST),`$(CYGPATH) -w '$(1)'`,$(1)) +CYGWIN_PATH = $(if $(CYGWIN_TEST),`$(CYGPATH) -w -p $(1)`,$(1)) +CYGWIN_FILE = $(if $(CYGWIN_TEST),`$(CYGPATH) -w $(1)`,$(1)) ############################################################################## diff --git a/support/make/grep.mk b/support/make/grep.mk index 37149fe224..d8c9c66498 100644 --- a/support/make/grep.mk +++ b/support/make/grep.mk @@ -44,7 +44,7 @@ grep : "$(MAKE) $@ [FLAGS=<flags>] REGEX=<regex> [FILES=<files>]";\ exit 1; \ fi - @$(GREP_BINARY) $(GREP_FLAGS) '$(GREP_REGEX)' $(GREP_FILES) + @$(GREP_BINARY) $(GREP_FLAGS) '$(GREP_REGEX)' $(GREP_FILES:%='%') .PHONY : grep diff --git a/support/make/jc.mk b/support/make/jc.mk index 80a406428d..5692535568 100644 --- a/support/make/jc.mk +++ b/support/make/jc.mk @@ -91,7 +91,7 @@ jc += $(jc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%)) jc += $(jc_ENCODING:%=-encoding %) jc += $(jc_SOURCE:%=-source %) jc += $(jc_TARGET:%=-target %) -jc += $(jc_FILES:%=$(call CYGWIN_FILE,%)) +jc += $(jc_FILES:%=$(call CYGWIN_FILE,'%')) ############################################################################## # Functions diff --git a/support/make/sc.mk b/support/make/sc.mk index 823db89382..edf861bd5e 100644 --- a/support/make/sc.mk +++ b/support/make/sc.mk @@ -91,7 +91,7 @@ sc += $(sc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%)) sc += $(sc_ENCODING:%=-encoding %) sc += $(sc_SOURCE:%=-source %) sc += $(sc_TARGET:%=-target %) -sc += $(sc_FILES:%=$(call CYGWIN_FILE,%)) +sc += $(sc_FILES:%=$(call CYGWIN_FILE,'%')) ############################################################################## # Functions diff --git a/support/make/sdc.mk b/support/make/sdc.mk index 5c9601d790..41f07276be 100644 --- a/support/make/sdc.mk +++ b/support/make/sdc.mk @@ -91,7 +91,7 @@ sdc += $(sdc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%)) sdc += $(sdc_ENCODING:%=-encoding %) sdc += $(sdc_SOURCE:%=-source %) sdc += $(sdc_TARGET:%=-target %) -sdc += $(sdc_FILES:%=$(call CYGWIN_FILE,%)) +sdc += $(sdc_FILES:%=$(call CYGWIN_FILE,'%')) ############################################################################## # Functions diff --git a/support/make/wc.mk b/support/make/wc.mk index 744920939d..e273544f48 100644 --- a/support/make/wc.mk +++ b/support/make/wc.mk @@ -38,7 +38,7 @@ WC_FILES ?= $(if $(FILES),$(FILES),$(PROJECT_SOURCES)) # Rules wc : - @$(WC_BINARY) $(WC_FLAGS) $(WC_FILES) + @$(WC_BINARY) $(WC_FLAGS) $(WC_FILES:%='%') .PHONY : wc |