From f0dcfb1f4bfcdbdddf9a022aa657ba132091e3e1 Mon Sep 17 00:00:00 2001 From: Kevin K Date: Sat, 4 Jun 2016 07:58:09 -0400 Subject: [PATCH] Deduplicates the Makefile --- Makefile | 28 ++++------------------------ README.md | 4 ++-- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 22ab3133..7e587fb9 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,13 @@ -toml = imag-$@/Cargo.toml -bin = imag-$@/target/debug/imag-$@ +toml = $@/Cargo.toml +bin = $@/target/debug/$@ default: all .PHONY: clean -all: counter link notes store tag view +all: imag-counter imag-link imag-notes imag-store imag-tag imag-view -counter: prep - cargo build --manifest-path $(toml) - cp $(bin) out/ - -link: prep - cargo build --manifest-path $(toml) - cp $(bin) out/ - -notes: prep - cargo build --manifest-path $(toml) - cp $(bin) out/ - -store: prep - cargo build --manifest-path $(toml) - cp $(bin) out/ - -tag: prep - cargo build --manifest-path $(toml) - cp $(bin) out/ - -view: prep +imag-%: prep cargo build --manifest-path $(toml) cp $(bin) out/ diff --git a/README.md b/README.md index 449477aa..09ff37dd 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,8 @@ imag-counter imag-link imag-notes imag-store imag-tag imag-view ``` Building all the modules may take some time, so alternatively one can build only a specific module -by runing `$> make $module` where `$module` is one of the `imag-$module` names, such as `counter`, -`link`, etc. +by runing `$> make $module` where `$module` is one of the `imag-*` names, such as `imag-counter`, +`imag-link`, etc. ### Running