From 25b6309cf248a1c5c092780e98107d281999bd85 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 26 Jun 2021 08:46:20 +0200 Subject: [mod] move functions from utils/manage_static.sh to ./manage script The functions: - static.build.commit - static.build.commit.drop - static.build.restore are imported into the ./manage script. To avoid name collisions some variables and fucntions has been renamed by adding the prefix *static_*. Signed-off-by: Markus Heiser --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9c99aed0c..ea743dd35 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ .DEFAULT_GOAL=help export MTOOLS=./manage -export MSTATIC=./utils/manage_static.sh include utils/makefile.include @@ -60,8 +59,8 @@ test.shell: $(Q)shellcheck -x -s bash \ utils/brand.env \ $(MTOOLS) \ - $(MSTATIC) \ utils/lib.sh \ + utils/lib_static.sh \ utils/filtron.sh \ utils/searx.sh \ utils/morty.sh \ @@ -85,6 +84,7 @@ MANAGE += pyenv pyenv.install pyenv.uninstall MANAGE += pypi.upload pypi.upload.test MANAGE += test.yamllint test.pylint test.pep8 test.unit test.coverage test.robot test.clean MANAGE += themes.all themes.oscar themes.simple pygments.less +MANAGE += static.build.commit static.build.drop static.build.restore PHONY += $(MANAGE) @@ -92,11 +92,6 @@ $(MANAGE): $(Q)$(MTOOLS) $@ -MANAGE_STATIC += static.build.commit.drop static.build.commit static.git.restore.staged static.git.restore - -$(MANAGE_STATIC): - $(Q)$(MSTATIC) $@ - # deprecated PHONY += docs docs-clean docs-live docker themes -- cgit v1.2.3