diff options
| author | Miki Tebeka <miki.tebeka@gmail.com> | 2015-03-01 06:12:42 +0200 |
|---|---|---|
| committer | Miki Tebeka <miki.tebeka@gmail.com> | 2015-03-01 06:12:42 +0200 |
| commit | 9fb199e2cb2cf44cd61c2a226193a70f6013aadc (patch) | |
| tree | 325a2a8e33e3e8d18217d10854152cab82ac8b61 /rust | |
| parent | 49916f9402e30a5277146355be878b32ec30f46d (diff) | |
| parent | 2cb013877c4ed41d245ce7c5525405c4833c503d (diff) | |
| download | mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.tar.gz mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.zip | |
Merge branch 'master' of https://github.com/kanaka/mal
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/Cargo.toml | 2 | ||||
| -rw-r--r-- | rust/Makefile | 11 | ||||
| -rw-r--r-- | rust/src/stepA_mal.rs (renamed from rust/src/stepA_interop.rs) | 0 |
3 files changed, 8 insertions, 5 deletions
diff --git a/rust/Cargo.toml b/rust/Cargo.toml index d382d32..daf999d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -36,4 +36,4 @@ name = "step8_macros" [[bin]] name = "step9_try" [[bin]] -name = "stepA_interop" +name = "stepA_mal" diff --git a/rust/Makefile b/rust/Makefile index 537dac5..da8a6c6 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -3,24 +3,27 @@ SOURCES_BASE = src/types.rs src/readline.rs \ src/reader.rs src/printer.rs \ src/env.rs src/core.rs -SOURCES_LISP = src/env.rs src/core.rs src/stepA_interop.rs +SOURCES_LISP = src/env.rs src/core.rs src/stepA_mal.rs SOURCES = $(SOURCES_BASE) $(SOURCES_LISP) ##################### -SRCS = step0_repl.rs step1_read_print.rs step2_eval.rs step3_env.rs \ +SRCS = step1_read_print.rs step2_eval.rs step3_env.rs \ step4_if_fn_do.rs step5_tco.rs step6_file.rs step7_quote.rs \ - step8_macros.rs step9_try.rs stepA_interop.rs + step8_macros.rs step9_try.rs stepA_mal.rs BINS = $(SRCS:%.rs=target/%) ##################### -all: $(BINS) mal +all: mal mal: ${SOURCES_BASE} $(word $(words ${SOURCES_LISP}),${SOURCES_LISP}) cargo build cp $(word $(words ${BINS}),${BINS}) $@ +#$(BINS): target/%: src/%.rs +# cargo build $* + clean: cargo clean rm -f mal diff --git a/rust/src/stepA_interop.rs b/rust/src/stepA_mal.rs index 8e30867..8e30867 100644 --- a/rust/src/stepA_interop.rs +++ b/rust/src/stepA_mal.rs |