[MPlayer-cvslog] CVS: main/vidix Makefile,1.6,1.7

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	27 Jan 2006 00:06:41 -0000	1.6
+++ Makefile	26 Mar 2006 10:52:13 -0000	1.7
@@ -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 @@
 .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 @@
 
 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