diff options
| author | Holger Steinhaus <hsteinhaus@gmx.de> | 2015-11-17 11:10:40 +0100 |
|---|---|---|
| committer | Holger Steinhaus <hsteinhaus@gmx.de> | 2015-11-17 11:10:40 +0100 |
| commit | cd01e1d060d35667d0a8a964b8b584360840160a (patch) | |
| tree | f6d25e9acf2017f2373d008b1547bcfa528827d2 | |
| parent | ca48fd19936f52f078a0a950262757c16eccce11 (diff) | |
| download | vdr-plugin-mcli-cleanup.tar.gz vdr-plugin-mcli-cleanup.tar.bz2 | |
Makefile: make sure that recursive make stages use exactly the same xml2-configcleanup
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | mcast/client/Makefile | 6 | ||||
| -rw-r--r-- | mcast/tool/Makefile | 7 |
3 files changed, 8 insertions, 19 deletions
@@ -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: 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 |