tools/Rules.mk: Cleanup %.pc rules
authorAnthony PERARD <anthony.perard@citrix.com>
Mon, 6 Dec 2021 17:02:33 +0000 (17:02 +0000)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 16 Dec 2021 20:27:13 +0000 (20:27 +0000)
PKG_CONFIG_VARS isn't set anymore, so is dead logic.

For "local" pkg-config file, we only have one headers directory now,
"tools/include", so there is no need to specify it twice. So remove
$(CFLAGS_xeninclude) from "Cflags:".

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
tools/Rules.mk

index 0d3febfbb67ca56f4052fa42017de7115b8c6890..47424935ba55f667887e043dbfdb376521506c01 100644 (file)
@@ -184,12 +184,11 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR)
        echo "prefix=$(PKG_CONFIG_PREFIX)"; \
        echo "includedir=$(PKG_CONFIG_INCDIR)"; \
        echo "libdir=$(PKG_CONFIG_LIBDIR)"; \
-       $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \
        echo ""; \
        echo "Name: $(PKG_CONFIG_NAME)"; \
        echo "Description: $(PKG_CONFIG_DESC)"; \
        echo "Version: $(PKG_CONFIG_VERSION)"; \
-       echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \
+       echo "Cflags: -I\$${includedir}"; \
        echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \
        echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \
        echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \
@@ -200,7 +199,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR)
        echo "prefix=$(PKG_CONFIG_PREFIX)"; \
        echo "includedir=$(PKG_CONFIG_INCDIR)"; \
        echo "libdir=$(PKG_CONFIG_LIBDIR)"; \
-       $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \
        echo ""; \
        echo "Name: $(PKG_CONFIG_NAME)"; \
        echo "Description: $(PKG_CONFIG_DESC)"; \