Skip to content
This repository was archived by the owner on Aug 19, 2019. It is now read-only.

Explicitly list the submodules during init and deinit. #54

Merged
igorpeshansky merged 1 commit into from
Feb 16, 2018
Merged

Explicitly list the submodules during init and deinit. #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down