diff options
| author | mihaylov <mihaylov@epfl.ch> | 2005-10-04 09:37:36 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2005-10-04 09:37:36 +0000 |
| commit | 88445e5c92dddd006679d566cf47fde960aa6554 (patch) | |
| tree | fd6c1c80af68eb94db101459d77691c815893520 | |
| parent | c420d1b4b60a51236de6be50702d46a75f6546c1 (diff) | |
| download | scala-88445e5c92dddd006679d566cf47fde960aa6554.tar.gz scala-88445e5c92dddd006679d566cf47fde960aa6554.tar.bz2 scala-88445e5c92dddd006679d566cf47fde960aa6554.zip | |
Improved handling of command-line options
| -rw-r--r-- | support/make/ilasm.mk | 16 | ||||
| -rw-r--r-- | support/make/ildasm.mk | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/support/make/ilasm.mk b/support/make/ilasm.mk index 26b48674e0..47a5116ea4 100644 --- a/support/make/ilasm.mk +++ b/support/make/ilasm.mk @@ -58,14 +58,14 @@ ilasm_FILES = $(call ILASM_LOOKUP,ILASM_FILES) ############################################################################## -MONO_OUT_FLAG = /output: -MONO_KEY_FLAG = /key: +MONO_ILASM_OUT_FLAG = /output: +MONO_ILASM_KEY_FLAG = /key: -MSCLR_OUT_FLAG = /out= -MSCLR_KEY_FLAG = /key= +MSCLR_ILASM_OUT_FLAG = /out= +MSCLR_ILASM_KEY_FLAG = /key= -OUT_FLAG = $($(MSIL_PLATFORM)_OUT_FLAG) -KEY_FLAG = $($(MSIL_PLATFORM)_KEY_FLAG) +ILASM_OUT_FLAG = $($(MSIL_PLATFORM)_ILASM_OUT_FLAG) +ILASM_KEY_FLAG = $($(MSIL_PLATFORM)_ILASM_KEY_FLAG) ############################################################################## # Command @@ -73,8 +73,8 @@ KEY_FLAG = $($(MSIL_PLATFORM)_KEY_FLAG) ilasm += $(ilasm_assembler) ilasm += $(ilasm_assembler_flags) ilasm += $(ilasm_FLAGS) -ilasm += $(ilasm_OUTPUTFILE:%=$(OUT_FLAG)$(call CYGWIN_FILE,%)) -ilasm += $(ilasm_KEYFILE:%=$(KEY_FLAG)$(call CYGWIN_FILE,%)) +ilasm += $(ilasm_OUTPUTFILE:%=$(ILASM_OUT_FLAG)$(call CYGWIN_FILE,%)) +ilasm += $(ilasm_KEYFILE:%=$(ILASM_KEY_FLAG)$(call CYGWIN_FILE,%)) ilasm += $(ilasm_FILES:%=$(call CYGWIN_FILE,'%')) ############################################################################## diff --git a/support/make/ildasm.mk b/support/make/ildasm.mk index f99b7d8603..1fc85b7d1b 100644 --- a/support/make/ildasm.mk +++ b/support/make/ildasm.mk @@ -55,10 +55,10 @@ ildasm_FILES = $(call ILDASM_LOOKUP,ILDASM_FILES) ############################################################################## -MONO_OUT_FLAG = --output= -MSCLR_OUT_FLAG = /out= +MONO_ILDASM_OUT_FLAG = --output= +MSCLR_ILDASM_OUT_FLAG = /out= -OUT_FLAG = $($(MSIL_PLATFORM)_OUT_FLAG) +ILDASM_OUT_FLAG = $($(MSIL_PLATFORM)_ILDASM_OUT_FLAG) ############################################################################## # Command @@ -66,7 +66,7 @@ OUT_FLAG = $($(MSIL_PLATFORM)_OUT_FLAG) ildasm += $(ildasm_disassembler) ildasm += $(ildasm_disassembler_flags) ildasm += $(ildasm_FLAGS) -ildasm += $(ildasm_OUTPUTFILE:%=$(OUT_FLAG)$(call CYGWIN_FILE,%)) +ildasm += $(ildasm_OUTPUTFILE:%=$(ILDASM_OUT_FLAG)$(call CYGWIN_FILE,%)) ildasm += $(ildasm_FILES:%=$(call CYGWIN_FILE,'%')) ############################################################################## |