summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-30 08:28:58 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-30 08:28:58 +0000
commit9261f1cb954e56c94a5df087832eede0270f0f7e (patch)
tree0436d3a95d3fb915d8e6b1c0535b193e3d886305
parent0c1724959f47b37d775073b854b29b0963645320 (diff)
downloadmpv-9261f1cb954e56c94a5df087832eede0270f0f7e.tar.bz2
mpv-9261f1cb954e56c94a5df087832eede0270f0f7e.tar.xz
Make libmpdvdkit2 compilation slightly more consistent with the other modules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20525 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile1
-rwxr-xr-xconfigure1
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7a519ca153..2e432be307 100644
--- a/Makefile
+++ b/Makefile
@@ -249,6 +249,7 @@ COMMON_DEPS += libfame/libfame.a
endif
ifeq ($(DVDKIT2),yes)
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
+COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
endif
ifeq ($(CONFIG_ASS),yes)
COMMON_DEPS += libass/libass.a
diff --git a/configure b/configure
index dcabbb7b46..3a7fb1ee5b 100755
--- a/configure
+++ b/configure
@@ -5253,7 +5253,6 @@ case "$_dvdread" in
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