From e9d3f37d35860b69f0b845699d2d5a2e788f477a Mon Sep 17 00:00:00 2001
From: Holger Steinhaus <hsteinhaus@gmx.de>
Date: Fri, 11 Sep 2015 18:22:20 +0200
Subject: serveral Makefile fixes

fixed build of mcli-shared exexutable
fixed dependecies for reliable parallel build
---
 mcast/client/Makefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'mcast/client/Makefile')

diff --git a/mcast/client/Makefile b/mcast/client/Makefile
index 1ea0844..0c79969 100644
--- a/mcast/client/Makefile
+++ b/mcast/client/Makefile
@@ -10,7 +10,7 @@ ifdef RBMINI
   ARMEL=1
 endif
 
-ARCH= $(shell $(CC) -dumpmachine)
+ARCH ?= $(shell $(CC) -dumpmachine)
 APPLE_DARWIN = $(shell echo $(ARCH) | grep -q 'apple-darwin' && echo "1" || echo "0")
 CYGWIN = $(shell echo $(ARCH) | grep -q 'cygwin' && echo "1" || echo "0")
 MIPSEL = $(shell echo $(ARCH) | grep -q 'mipsel' && echo "1" || echo "0")
@@ -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
@@ -106,7 +100,10 @@ MCLI_SOBJS := $(MCLI_SOBJS) dvblo_handler.o input.o
 endif 
 endif
 
-all: lib$(MCLI)
+all: 
+	$(MAKE) lib$(MCLI)
+	$(MAKE) $(MCLI)-shared
+	$(MAKE) mcli
 
 static: $(MCLI)-static
 
@@ -119,7 +116,7 @@ $(DEPFILE): Makefile
 -include $(DEPFILE)
 
 
-$(MCLI): $(MCLI_OBJS) $(MCLI_SOBJS)
+$(MCLI): $(MCLI_OBJS) $(MCLI_SOBJS) libmcli.so
 	$(CC) $(LDFLAGS) -o $@ $(MCLI_OBJS) $(MCLI_SOBJS) $(LDLIBS)
 ifndef DEBUG
 ifndef WIN32
-- 
cgit v1.2.3