summaryrefslogtreecommitdiffstats
path: root/Makefile
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 /Makefile
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 'Makefile')
-rw-r--r--Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index bf791d0ed8..2d766e3e56 100644
--- a/Makefile
+++ b/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"