Mercurial > mplayer.hg

changeset 21336:db862c74f6d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unrecurse VIDIX installation.
author diego
date Tue, 28 Nov 2006 10:04:41 +0000
parents 54f621f7a37b
children c2b31c3f1fa6
files Makefile vidix/drivers/Makefile
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Nov 28 09:36:39 2006 +0000
+++ b/Makefile	Tue Nov 28 10:04:41 2006 +0000
@@ -251,7 +251,8 @@
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
 	$(MAKE) -C libdha install
-	$(MAKE) -C vidix/drivers install
+	mkdir -p $(LIBDIR)/mplayer/vidix
+	-install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
 endif
 	$(INSTALL) -d $(BINDIR)
 	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
--- a/vidix/drivers/Makefile	Tue Nov 28 09:36:39 2006 +0000
+++ b/vidix/drivers/Makefile	Tue Nov 28 10:04:41 2006 +0000
@@ -67,10 +67,6 @@
 dep depend:
 # do nothing here
 
-install:
-	mkdir -p $(LIBDIR)/mplayer/vidix
-	-install -m 755 $(INSTALLSTRIP) -p *.so $(LIBDIR)/mplayer/vidix
-
 ifneq ($(wildcard .depend),)
 include .depend
 endif