From ff0067986f2dc4561c713dc08aaf56443ad9a5fd Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Thu, 15 Feb 2018 22:45:53 -0500 Subject: [PATCH] Explicitly list the submodules during init and deinit. --- src/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index 192e1af3..9b7a4c60 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,6 +3,7 @@ CPP_NETLIB_DIR=$(LIBDIR)/cpp-netlib CPP_NETLIB_LIBDIR=$(CPP_NETLIB_DIR)/libs/network/src YAML_CPP_DIR=$(LIBDIR)/yaml-cpp YAML_CPP_LIBDIR=$(YAML_CPP_DIR) +SUBMODULE_DIRS=$(CPP_NETLIB_DIR) $(YAML_CPP_DIR) SED_I=/usr/bin/env sed -i CMAKE=cmake @@ -123,14 +124,11 @@ clean: $(RM) metadatad $(OBJS) purge: clean - $(RM) -r init-submodules build-cpp-netlib build-yaml-cpp \ - $(CPP_NETLIB_DIR) $(YAML_CPP_DIR) - git submodule deinit --all + $(RM) -r init-submodules build-cpp-netlib build-yaml-cpp + git submodule deinit -f $(SUBMODULE_DIRS) init-submodules: - cd .. && \ - git submodule init && \ - git submodule update + git submodule update --init $(SUBMODULE_DIRS) touch init-submodules $(CPP_NETLIB_DIR)/Makefile: init-submodules