[MPlayer-cvslog] r21352 - in trunk: Makefile vidix/drivers/Makefile

[diego]

Author: diego
Date: Tue Nov 28 11:04:41 2006
New Revision: 21352

Modified:
   trunk/Makefile
   trunk/vidix/drivers/Makefile

Log:
Unrecurse VIDIX installation.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Nov 28 11:04:41 2006
@@ -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) \

Modified: trunk/vidix/drivers/Makefile
==============================================================================
--- trunk/vidix/drivers/Makefile	(original)
+++ trunk/vidix/drivers/Makefile	Tue Nov 28 11:04:41 2006
@@ -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