From 689d0cc0f40c3a03d2e4dacf1f0d891da329a9c9 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Nov 2006 12:25:56 +0000 Subject: Move libdvdcss into its own subdirectory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 751ba680dd..3a1b7aae6c 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,7 @@ PARTS += libfame endif ifeq ($(DVDKIT2),yes) PARTS += libmpdvdkit2 +PARTS += libdvdcss endif ifeq ($(GUI),yes) PARTS += Gui @@ -175,6 +176,8 @@ endif ifeq ($(DVDKIT2),yes) COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a +COMMON_DEPS += libdvdcss/libdvdcss.a +COMMON_LIBS += libdvdcss/libdvdcss.a endif ifeq ($(CONFIG_ASS),yes) COMMON_DEPS += libass/libass.a @@ -207,6 +210,9 @@ libaf/libaf.a: libmpdvdkit2/libmpdvdkit.a: $(MAKE) -C libmpdvdkit2 +libdvdcss/libdvdcss.a: + $(MAKE) -C libdvdcss + loader/libloader.a: $(MAKE) -C loader @@ -476,6 +482,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch]) libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch]) libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch]) +libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch]) stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch]) -- cgit v1.2.3