summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Krehl <mario-krehl@gmx.de>2017-03-02 20:35:05 +0100
committerMario Krehl <mario-krehl@gmx.de>2017-03-02 21:10:25 +0100
commite98715589adc57d83586d099dcce5a7aa0728cf9 (patch)
tree862827ded1c9a723b3e6b59b11230630805f4372
parent4ff88dca6eaa60f9f462c795192f6380c6e85fd3 (diff)
downloadimag-e98715589adc57d83586d099dcce5a7aa0728cf9.zip
imag-e98715589adc57d83586d099dcce5a7aa0728cf9.tar.gz
Change `make clean` because it works with workspaces now
-rw-r--r--Makefile13
1 files changed, 2 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index cf6a5f9..5a2a6ee 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,6 @@ LIB_TARGETS_TEST=$(foreach x,$(subst ./,,$(LIBS)),$(x)-test)
TARGETS=$(BIN_TARGETS) $(LIB_TARGETS)
RELEASE_TARGETS=$(foreach x,$(TARGETS),$(x)-release)
INSTALL_TARGETS=$(foreach x,$(BIN_TARGETS),$(x)-install)
-UPDATE_TARGETS=$(foreach x,$(TARGETS),$(x)-update)
-CLEAN_TARGETS=$(foreach x,$(TARGETS),$(x)-clean)
CHECK_TARGETS=$(foreach x,$(TARGETS),$(x)-check)
CHECK_OUTDATED_TARGETS=$(foreach x,$(TARGETS),$(x)-check-outdated)
@@ -38,10 +36,6 @@ imag-bin-install:
@$(ECHO) "\t[IMAG ][INSTALL]"
@$(CARGO) install --force --path ./bin
-imag-bin-clean:
- @$(ECHO) "\t[IMAG ][CLEAN ]"
- @$(CARGO) clean --manifest-path ./bin/Cargo.toml
-
imag-bin-check:
@$(ECHO) "\t[IMAG ][CHECK ]"
@$(CARGO) check --manifest-path ./bin/Cargo.toml
@@ -75,8 +69,9 @@ update:
@$(ECHO) "\t[UPDATE ]"
@$(CARGO) update
-clean: $(CLEAN_TARGETS) imag-bin-clean
+clean:
@$(ECHO) "\t[CLEAN ]"
+ @$(CARGO) clean
check: $(CHECK_TARGETS) imag-bin-check
@@ -104,10 +99,6 @@ $(INSTALL_TARGETS): %: .FORCE imag-bin-install
@$(ECHO) "\t[INSTALL]:\t$(subst -install,,$@)"
@$(CARGO) install --force --path ./$(subst -install,,$@)
-$(CLEAN_TARGETS): %: .FORCE
- @$(ECHO) "\t[CLEAN ]:\t$(subst -clean,,$@)"
- @$(CARGO) clean --manifest-path ./$(subst -clean,,$@)/Cargo.toml
-
$(CHECK_TARGETS): %: .FORCE
@$(ECHO) "\t[CHECK ]:\t$(subst -check,,$@)"
@$(CARGO) check --manifest-path ./$(subst -check,,$@)/Cargo.toml