From cd01e1d060d35667d0a8a964b8b584360840160a Mon Sep 17 00:00:00 2001
From: Holger Steinhaus <hsteinhaus@gmx.de>
Date: Tue, 17 Nov 2015 11:10:40 +0100
Subject: Makefile: make sure that recursive make stages use exactly the same
 xml2-config

---
 Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 074cc1d..96c99ee 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ SOFILE = libvdr-$(PLUGIN).so
 
 .PHONY: i18n all clean
 
-XML_INC := `xml2-config --cflags`
-XML_LIB := `xml2-config --libs`
+XML_INC ?= $(shell xml2-config --cflags)
+XML_LIB ?= $(shell xml2-config --libs)
 
 ifdef MCLI_SHARED
   LIBS = -Lmcast/client -lmcli $(XML_LIB)
@@ -71,17 +71,17 @@ all:  lib plugin tools i18n
 
 
 plugin: i18n
-	$(MAKE) libvdr-$(PLUGIN).so
+	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" libvdr-$(PLUGIN).so
 
 tools: lib
-	 $(MAKE) -C mcast/client/ mcli
-	 $(MAKE) -C mcast/tool/ all
+	 $(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ mcli
+	 $(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/tool/ all
 
 lib:
-	$(MAKE) libmcli.so
+	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" libmcli.so
 
 libmcli.a libmcli.so:
-	$(MAKE) -C mcast/client/ libmcli
+	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ libmcli
 
 ### Implicit rules:
 
-- 
cgit v1.2.3