[Mplayer-cvslog] CVS: main Makefile,1.198,1.199 configure,1.539,1.540
Johannes Feigl
jaf at mplayerhq.hu
Sat Aug 17 11:34:56 CEST 2002
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv22111
Modified Files:
Makefile configure
Log Message:
libmpdvdkit2 directory was not compiled - mplayer compile failed - fixed.
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- Makefile 10 Aug 2002 18:45:31 -0000 1.198
+++ Makefile 17 Aug 2002 09:34:53 -0000 1.199
@@ -117,6 +117,13 @@
COMMON_DEPS += libmpdvdkit/libmpdvdkit.a
endif
endif
+ifeq ($(DVDKIT2),yes)
+ifeq ($(DVDKIT_SHARED),yes)
+COMMON_DEPS += libmpdvdkit2/libmpdvdkit.so
+else
+COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
+endif
+endif
libmpdvdkit/libmpdvdkit.a:
$(MAKE) -C libmpdvdkit
@@ -124,6 +131,12 @@
libmpdvdkit/libmpdvdkit.so:
$(MAKE) -C libmpdvdkit libmpdvdkit.so
+libmpdvdkit2/libmpdvdkit.a:
+ $(MAKE) -C libmpdvdkit2
+
+libmpdvdkit2/libmpdvdkit.so:
+ $(MAKE) -C libmpdvdkit2 libmpdvdkit.so
+
loader/libloader.a:
$(MAKE) -C loader
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- configure 16 Aug 2002 23:04:29 -0000 1.539
+++ configure 17 Aug 2002 09:34:53 -0000 1.540
@@ -3020,6 +3020,8 @@
if test -f "./libmpdvdkit2/Makefile" ; then
_inputmodules="mpdvdkit2 $_inputmodules"
_dvdread=libmpdvdkit2
+ _dvdkit2=yes
+ _dvdkit=no
else
_inputmodules="mpdvdkit $_inputmodules"
_dvdread=libmpdvdkit
@@ -3039,7 +3041,11 @@
else
_noinputmodules="mpdvdkit $_noinputmodules"
fi
-echores "$_dvdkit"
+if test "$_dvdkit" = yes || test "$_dvdkit2" = yes; then
+ echores "yes"
+else
+ echores "no"
+fi
echocheck "DVD support (libcss - old style)"
if test "$_css" = auto ; then
@@ -4242,6 +4248,7 @@
CSS_USE = $_css
CSS_LIB = $_ld_css
DVDKIT = $_dvdkit
+DVDKIT2 = $_dvdkit2
DVDKIT_SHARED = no
SDL_INC = $_inc_sdl
W32_DEP = $_dep_win32
More information about the MPlayer-cvslog
mailing list