summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-18 00:33:01 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-18 00:33:01 +0000
commit8cf4397274d9f5cf35f1961d154ebb811f4f0f2f (patch)
treea1f3c9c8a20486295a018a3f82b688c1dc562ddd /Makefile
parent2f67bb7b34ce9e81b62c16c849cf4cd48753c1df (diff)
downloadmpv-8cf4397274d9f5cf35f1961d154ebb811f4f0f2f.tar.bz2
mpv-8cf4397274d9f5cf35f1961d154ebb811f4f0f2f.tar.xz
Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread. This will also allow getting rid of some local modifications. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e259e224fd..03546fad45 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
ifeq ($(DVDREAD_INTERNAL),yes)
-PARTS += libdvdread
+PARTS += dvdread
PARTS += libdvdcss
endif
ifeq ($(GUI),yes)
@@ -168,8 +168,8 @@ ifeq ($(VIDIX),yes)
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
endif
ifeq ($(DVDREAD_INTERNAL),yes)
-COMMON_DEPS += libdvdread/libdvdread.a
-COMMON_LIBS += libdvdread/libdvdread.a
+COMMON_DEPS += dvdread/libdvdread.a
+COMMON_LIBS += dvdread/libdvdread.a
COMMON_DEPS += libdvdcss/libdvdcss.a
COMMON_LIBS += libdvdcss/libdvdcss.a
endif
@@ -201,8 +201,8 @@ all: $(ALL_PRG)
libaf/libaf.a:
$(MAKE) -C libaf
-libdvdread/libdvdread.a:
- $(MAKE) -C libdvdread
+dvdread/libdvdread.a:
+ $(MAKE) -C dvdread
libdvdcss/libdvdcss.a:
$(MAKE) -C libdvdcss
@@ -476,7 +476,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch])
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
-libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch])
+dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])