hwloc: limit rules for utils to ours only

EinsteinToolkit · Nov 21, 2019 · 69abd31 · 69abd31
1 parent 06de26b
commit 69abd31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/make.configuration.defn b/src/make.configuration.defn
@@ -2,4 +2,5 @@
 
 # Define the hwloc utilities
 STD_HWLOC_UTILS = hwloc-assembler hwloc-assembler-remote hwloc-bind hwloc-calc hwloc-distances hwloc-distrib hwloc-info hwloc-ls hwloc-ps lstopo lstopo-no-graphics
-ALL_UTILS += $(filter $(STD_HWLOC_UTILS), $(notdir $(wildcard $(HWLOC_DIR)/bin/*)))
+HWLOC_UTILS = $(filter $(STD_HWLOC_UTILS), $(notdir $(wildcard $(HWLOC_DIR)/bin/*)))
+ALL_UTILS += $(HWLOC_UTILS)
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
@@ -2,7 +2,7 @@
 
 # The hwloc utilities are copied from the install directory
 
-$(UTIL_DIR)/%: $(HWLOC_DIR)/bin/%
+$(patsubst %,$(UTIL_DIR)/%,$(HWLOC_UTILS)): $(UTIL_DIR)/% : $(HWLOC_DIR)/bin/%
 	@echo "Copying $* from $< to $(UTIL_DIR)"
 	-$(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) 2> /dev/null
 	cp $< $@