[MPlayer-cvslog] r20525 - in trunk: Makefile configure

[diego]

Author: diego
Date: Mon Oct 30 09:28:58 2006
New Revision: 20525

Modified:
   trunk/Makefile
   trunk/configure

Log:
Make libmpdvdkit2 compilation slightly more consistent with the other modules.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Oct 30 09:28:58 2006
@@ -249,6 +249,7 @@
 endif
 ifeq ($(DVDKIT2),yes)
 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
+COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Oct 30 09:28:58 2006
@@ -5253,7 +5253,6 @@
   libmpdvdkit2)
 	_largefiles=yes
 	_def_dvdread='#define USE_DVDREAD 1'
-	_ld_dvdread='-Llibmpdvdkit2 -lmpdvdkit'
 	_noinputmodules="dvdread $_noinputmodules"
 	_def_mpdvdkit="#define USE_MPDVDKIT 2"
 	_have_dvd=yes