diff --git a/GNUmakefile b/GNUmakefile index acff187..4bc8c8a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -DEPEND = github.com/norayr/lists github.com/norayr/Internet github.com/norayr/opts github.com/norayr/skprLogger github.com/norayr/skprJson +DEPEND = github.com/norayr/lists github.com/norayr/Internet github.com/norayr/opts github.com/norayr/skprLogger github.com/norayr/skprJson codeberg.org/sts-q/vishaps-ssqJson VOC = /opt/voc/bin/voc mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) @@ -34,11 +34,22 @@ get_deps: build_deps: mkdir -p $(BUILD) - cd $(BUILD); - @for i in $(DEPEND); do \ - make -f "$(DPS)/$${i}/GNUmakefile" BUILD=$(BUILD); \ + cd $(BUILD); \ + for i in $(DEPEND); do \ + if [ -f "$(DPS)/$${i}/GNUmakefile" ]; then \ + make -f "$(DPS)/$${i}/GNUmakefile" BUILD=$(BUILD); \ + else \ + make -f "$(DPS)/$${i}/Makefile" BUILD=$(BUILD); \ + fi; \ done +#build_deps: +# mkdir -p $(BUILD) +# cd $(BUILD); +# @for i in $(DEPEND); do \ +# make -f "$(DPS)/$${i}/GNUmakefile" BUILD=$(BUILD); \ +# done + buildThis: cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkSettings.Mod cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/unix/vpkLinuxFiles.Mod