From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
The macro do_make_pkgconfig_file should be in utils.mk and not in the top
Makefile as utils.mk is where other similar macros are located.
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
Makefile | 8 --------
scripts/utils.mk | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index ab91ae777b83..595c8443e572 100644
--- a/Makefile
+++ b/Makefile
@@ -208,14 +208,6 @@ obj := $(objtree)
PKG_CONFIG_SOURCE_FILE = libtracecmd.pc
PKG_CONFIG_FILE := $(addprefix $(BUILD_OUTPUT)/,$(PKG_CONFIG_SOURCE_FILE))
-define do_make_pkgconfig_file
- cp -f $(srctree)/${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \
- sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \
- sed -i "s|LIB_VERSION|${LIBTRACECMD_VERSION}|g" ${PKG_CONFIG_FILE}; \
- sed -i "s|LIB_DIR|$(libdir)|g" ${PKG_CONFIG_FILE}; \
- sed -i "s|HEADER_DIR|$(includedir)/trace-cmd|g" ${PKG_CONFIG_FILE};
-endef
-
kshark-dir = $(src)/kernel-shark
export prefix bindir src obj kshark-dir
diff --git a/scripts/utils.mk b/scripts/utils.mk
index 1d090d8ac001..98549af9a774 100644
--- a/scripts/utils.mk
+++ b/scripts/utils.mk
@@ -142,3 +142,11 @@ define do_install_pkgconfig_file
(echo Failed to locate pkg-config directory) 1>&2; \
fi
endef
+
+define do_make_pkgconfig_file
+ cp -f $(srctree)/${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \
+ sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|LIB_VERSION|${LIBTRACECMD_VERSION}|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|LIB_DIR|$(libdir)|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|HEADER_DIR|$(includedir)/trace-cmd|g" ${PKG_CONFIG_FILE};
+endef
--
2.29.2
|