Mercurial > mplayer.hg
diff Makefile @ 20981:22cb9d5f1e21
Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread. This will also allow getting rid of some
local modifications.
author | diego |
---|---|
date | Sat, 18 Nov 2006 00:33:01 +0000 |
parents | 4b51e6459e64 |
children | 16fa2d135950 |
line wrap: on
line diff
--- a/Makefile Fri Nov 17 22:52:57 2006 +0000 +++ b/Makefile Sat Nov 18 00:33:01 2006 +0000 @@ -112,7 +112,7 @@ PARTS += libdha vidix endif ifeq ($(DVDREAD_INTERNAL),yes) -PARTS += libdvdread +PARTS += dvdread PARTS += libdvdcss endif ifeq ($(GUI),yes) @@ -168,8 +168,8 @@ 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 @@ 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 @@ 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])