aboutsummaryrefslogtreecommitdiffstats
diff options
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2020-12-15 22:09:33 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2020-12-15 22:09:33 -0500
commit87972be98667069ad7cce2dcb1b7d2aff12dc3e0 (patch)
treec1859d7197846326a10b11c7fa06de59d680cd5b
parente326dae31928426401c29b60bce3a8140d2622fe (diff)
downloadtrace-cmd.tar.gz
trace-cmd: Keep build_install files aroundtrace-cmd
Instead of rebuilding the build_install and build_libs_install files every time the uninstall is created, make it depend on the prefix, as if the prefix is the same, then the uninstall should be the same. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--.gitignore2
-rw-r--r--Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 9ce25c8e..af9bf6c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@ trace_python_dir
tracecmd_plugin_dir
libtracecmd.pc
build_prefix
+build_install
+build_libs_install
diff --git a/Makefile b/Makefile
index 396a6795..662d24ba 100644
--- a/Makefile
+++ b/Makefile
@@ -496,12 +496,12 @@ define build_uninstall_script
$(Q)$(RM) -rf $(BUILD_OUTPUT)/tmp_build
endef
-build_uninstall:
+build_uninstall: $(BUILD_PREFIX)
$(call build_uninstall_script,install,uninstall)
$(BUILD_OUTPUT)/build_uninstall: build_uninstall
-build_libs_uninstall:
+build_libs_uninstall: $(BUILD_PREFIX)
$(call build_uninstall_script,install_libs,libs_uninstall)
$(BUILD_OUTPUT)/build_libs_uninstall: build_libs_uninstall
@@ -514,11 +514,9 @@ endef
uninstall: $(BUILD_OUTPUT)/build_uninstall
@$(foreach file,$(shell cat $(BUILD_OUTPUT)/build_uninstall),$(call uninstall_file,$(file)))
- $(Q)$(RM) $<
uninstall_libs: $(BUILD_OUTPUT)/build_libs_uninstall
@$(foreach file,$(shell cat $(BUILD_OUTPUT)/build_libs_uninstall),$(call uninstall_file,$(file)))
- $(Q)$(RM) $<
##### PYTHON STUFF #####