From f01774accb4606de607d9597f40144d78eb62243 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

---
 Makefile              | 6 +++++-
 mcast/client/Makefile | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 29586ff..a1776d9 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ i18n-dist: $(I18Nmsgs)
 $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
-libvdr-$(PLUGIN).so: $(OBJS)
+libvdr-$(PLUGIN).so: $(OBJS) libmcli.a
 ifeq ($(APPLE_DARWIN), 1)
 	$(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
@@ -151,3 +151,7 @@ dist: clean
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	$(MAKE) -C mcast/client/ clean
+	$(MAKE) -C mcast/netcv2dvbip/ clean
+	$(MAKE) -C mcast/tool/ clean
+
diff --git a/mcast/client/Makefile b/mcast/client/Makefile
index 1ea0844..64b6873 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")
@@ -106,7 +106,7 @@ MCLI_SOBJS := $(MCLI_SOBJS) dvblo_handler.o input.o
 endif 
 endif
 
-all: lib$(MCLI)
+all: lib$(MCLI) $(MCLI)-shared
 
 static: $(MCLI)-static
 
@@ -119,7 +119,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