Don't call make from shell constructs it prevent proper

build paralelization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17959 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -21,12 +21,6 @@ ifeq ($(STRIPBINARIES),yes)
 INSTALLSTRIP = -s
 endif
 
-# These subdirectories require installation due to binaries within them.
-ifeq ($(VIDIX),yes)
-SUBDIRS += libdha vidix
-DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
-endif
-
 SRCS_COMMON = asxparser.c \
               codec-cfg.c \
               cpudetect.c \
@@ -466,7 +460,8 @@ $(PRG_CFG): version.h codec-cfg.c codec-cfg.h help_mp.h
 
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
-	$(DO_MAKE)
+	$(MAKE) -C libdha install
+	$(MAKE) -C vidix install
 endif
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
@@ -535,7 +530,8 @@ uninstall:
 	  fi ; \
 	done
 ifeq ($(VIDIX),yes)
-	$(DO_MAKE)
+	$(MAKE) -C libdha uninstall
+	$(MAKE) -C vidix uninstall
 endif
 	@echo "Uninstall completed"
 

vidix/Makefile

@@ -1,6 +1,4 @@
 LIBNAME = libvidix.a
-SUBDIRS = drivers
-DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 include ../config.mak
 
@@ -16,8 +14,10 @@ CFLAGS  = $(OPTFLAGS)
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-all:	$(SUBDIRS) $(LIBNAME)
-	$(DO_MAKE)
+all:	$(SUBDIRS) $(LIBNAME) do_drivers
+
+do_drivers:
+	$(MAKE) -C drivers
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
@@ -25,23 +25,23 @@ $(LIBNAME):	$(OBJS)
 
 clean:
 	rm -f *.o *.a *~
-	$(DO_MAKE)
+	$(MAKE) -C drivers clean
 
 distclean: clean
 	rm -f .depend test
-	$(DO_MAKE)
+	$(MAKE) -C drivers distclean
 
 dep:    depend
-	$(DO_MAKE)
+	$(MAKE) -C drivers dep
 
 depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 install:
-	$(DO_MAKE)
+	$(MAKE) -C drivers install
 
 uninstall:
-	$(DO_MAKE)
+	$(MAKE) -C drivers uninstall
 
 #
 # include dependency files if they exist