[MPlayer-cvslog] CVS: main Makefile,1.353,1.354

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv5916

Modified Files:
	Makefile 
Log Message:
Don't call make from shell constructs it prevent proper
build paralelization.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- Makefile	25 Mar 2006 22:41:15 -0000	1.353
+++ Makefile	26 Mar 2006 10:52:12 -0000	1.354
@@ -21,12 +21,6 @@
 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 @@
 
 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 @@
 	  fi ; \
 	done
 ifeq ($(VIDIX),yes)
-	$(DO_MAKE)
+	$(MAKE) -C libdha uninstall
+	$(MAKE) -C vidix uninstall
 endif
 	@echo "Uninstall completed"