Mercurial > mplayer.hg

changeset 21334:6460b4f44089

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove one level of indirection on VIDIX install/uninstall.
author diego
date Tue, 28 Nov 2006 09:33:53 +0000
parents 9e3860c22d99
children 54f621f7a37b
files Makefile vidix/Makefile
diffstat 2 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Nov 27 23:25:08 2006 +0000
+++ b/Makefile	Tue Nov 28 09:33:53 2006 +0000
@@ -251,7 +251,7 @@
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
 	$(MAKE) -C libdha install
-	$(MAKE) -C vidix install
+	$(MAKE) -C vidix/drivers install
 endif
 	$(INSTALL) -d $(BINDIR)
 	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
@@ -307,7 +307,7 @@
 	  fi ; \
 	done
 	$(MAKE) -C libdha uninstall
-	$(MAKE) -C vidix uninstall
+	$(MAKE) -C vidix/drivers uninstall
 	@echo "Uninstall completed"
 
 dirclean:
--- a/vidix/Makefile	Mon Nov 27 23:25:08 2006 +0000
+++ b/vidix/Makefile	Tue Nov 28 09:33:53 2006 +0000
@@ -35,12 +35,6 @@
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 	$(MAKE) -C drivers depend
 
-install:
-	$(MAKE) -C drivers install
-
-uninstall:
-	$(MAKE) -C drivers uninstall
-
 ifneq ($(wildcard .depend),)
 include .depend
 endif