summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-26 10:52:13 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-26 10:52:13 +0000
commitb29282c8474f3c32e50aa6c574be7444db15d455 (patch)
treecb433136ccd67f72911c25bc666d4f089171700c /vidix
parentbf291303a1edeac21498ecd7aa78038ab5adaee5 (diff)
downloadmpv-b29282c8474f3c32e50aa6c574be7444db15d455.tar.bz2
mpv-b29282c8474f3c32e50aa6c574be7444db15d455.tar.xz
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
Diffstat (limited to 'vidix')
-rw-r--r--vidix/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/vidix/Makefile b/vidix/Makefile
index b840c7615e..65da0a0ed5 100644
--- a/vidix/Makefile
+++ b/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