Skip to content

Commit 3015e0b

Browse files
committed
---
yaml --- r: 6154 b: refs/heads/master c: 0e15011 h: refs/heads/master v: v3
1 parent ebce3e4 commit 3015e0b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: f96f1692efa1b9d2f912a30d4b428ae6c913bc81
2+
refs/heads/master: 0e150116f33d8111520861b6758b4ca675cb0621

trunk/Makefile.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,17 @@ endif
318318
# Re-configuration
319319
######################################################################
320320

321+
# This is a pretty expensive operation but I don't see any way to avoid it
322+
SUBMODULE_STATUS=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status)
323+
# Look through for submodules prefixed with '-' (need init), or '+' (need update)
324+
NEED_GIT_RECONFIG=$(shell echo "$(SUBMODULE_STATUS)" | grep -c '^\(+\|-\)')
325+
326+
ifeq ($(NEED_GIT_RECONFIG),0)
327+
else
328+
# If the submodules have changed then always execute config.mk
329+
.PHONY: config.mk
330+
endif
331+
321332
config.mk: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
322333
@$(call E, cfg: reconfiguring)
323334
$(Q)$(S)configure $(CFG_CONFIGURE_ARGS)

0 commit comments

Comments
 (0)