summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBurt Silverman <burtms@gmail.com>2019-01-22 21:55:02 -0500
committerDamjan Marion <dmarion@me.com>2019-01-26 18:31:17 +0000
commite52973260730662d336a4044b33e847f40eec5f5 (patch)
tree1eb2b2c601bc2cd808e5390be9c67d51b5765924
parente0982e56f0b644fbec429fa8639ddb1b3403bea8 (diff)
Run vpp-configure on change to cmake config files.
Modify the dirs assignment in configure_check_timestamp to add the build-data/platforms/$(PLATFORM).mk file, all the CMakeLists.txt files in the $(PACKAGE_SOURCE) tree, and the $(PACKAGE_SOURCE)/cmake directory. (For example, for package vpp, $(PACKAGE_SOURCE) is <Top of Tree>/src). Note that in an earlier era there was no build-data/platforms directory and no CMakeLists.txt files. Also, we tacitly assume that $(SOURCE_PATH_BUILD_DATA_DIRS) is only one directory whereas ebuild has been used in environments where there are two treetops. Change-Id: I761219adbdb4c7e675bb12b3e7f052db68f0294c Signed-off-by: Burt Silverman <burtms@gmail.com>
-rw-r--r--build-root/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/build-root/Makefile b/build-root/Makefile
index a3335236c04..d810abb8626 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -625,6 +625,10 @@ configure_check_timestamp = \
mkdir -p $(PACKAGE_INSTALL_DIR) ; \
conf="$(TIMESTAMP_DIR)/$(CONFIGURE_TIMESTAMP)" ; \
dirs="$(call package_mk_fn,$(PACKAGE)) \
+ $(SOURCE_PATH_BUILD_DATA_DIRS)/platforms/$(PLATFORM).mk \
+ $(wildcard $(call find_source_fn,$(PACKAGE_SOURCE))/cmake) \
+ $(shell find $(call find_source_fn,$(PACKAGE_SOURCE)) \
+ -name CMakeLists.txt) \
$(wildcard $(call find_source_fn, \
$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)/configure) \
$(MU_BUILD_ROOT_DIR)/config.site" ; \