From cd01e1d060d35667d0a8a964b8b584360840160a Mon Sep 17 00:00:00 2001 From: Holger Steinhaus Date: Tue, 17 Nov 2015 11:10:40 +0100 Subject: Makefile: make sure that recursive make stages use exactly the same xml2-config --- mcast/client/Makefile | 6 ------ mcast/tool/Makefile | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'mcast') diff --git a/mcast/client/Makefile b/mcast/client/Makefile index 9add411..0c79969 100644 --- a/mcast/client/Makefile +++ b/mcast/client/Makefile @@ -32,17 +32,11 @@ VDRDIR=../../../../.. -include $(VDRDIR)/Make.config ifdef ARMEL - XML_INC := -I/usr/arm-linux-gnueabi/include/libxml2 - XML_LIB := -lxml2 CROSS = arm-linux-gnueabi- else ifeq ($(MIPSEL),1) DEFS:=$(DEFS) -DMIPSEL -XML_INC:=-I../../libxml2/include -XML_LIB:=-L../../libxml2/lib else -XML_INC:=`xml2-config --cflags` -XML_LIB:=`xml2-config --libs` LIBRARY_PATH=/usr/lib endif endif diff --git a/mcast/tool/Makefile b/mcast/tool/Makefile index 1c1d446..77b386c 100644 --- a/mcast/tool/Makefile +++ b/mcast/tool/Makefile @@ -26,12 +26,7 @@ endif VDRDIR=../../../../.. -include $(VDRDIR)/Make.config -ifdef ARMEL - XML_INC := -I/usr/arm-linux-gnueabi/include/libxml2 - XML_LIB := -lxml2 -else - XML_INC := `xml2-config --cflags` - XML_LIB := `xml2-config --libs` +ifndef ARMEL LIBRARY_PATH = /usr/lib endif -- cgit v1.2.3