Mercurial > mplayer.hg

changeset 26492:474d0127039a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge libdvdcss/Makefile into top-level Makefile.
author diego
date Thu, 24 Apr 2008 22:27:01 +0000
parents d010bd754e80
children 872363c4aafd
files Makefile libdvdcss/Makefile
diffstat 2 files changed, 10 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Apr 24 22:05:43 2008 +0000
+++ b/Makefile	Thu Apr 24 22:27:01 2008 +0000
@@ -261,6 +261,13 @@
 SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
                                         libmpcodecs/vd_libdv.c \
                                         libmpdemux/demux_rawdv.c
+SRCS_COMMON-$(DVDCSS_INTERNAL)       += libdvdcss/css.c \
+                                        libdvdcss/device.c \
+                                        libdvdcss/error.c \
+                                        libdvdcss/ioctl.c \
+                                        libdvdcss/libdvdcss.c \
+                                        #libdvdcss/bsdi_ioctl \
+
 SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
 SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c
 SRCS_COMMON-$(LIBNEMESI)             += libmpdemux/demux_nemesi.c \
@@ -483,7 +490,6 @@
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 COMMON_LIBS-$(FAAD_INTERNAL)      += libfaad2/libfaad2.a
 COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/dvdread.a
-COMMON_LIBS-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
 
 LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
 
@@ -508,7 +514,6 @@
         libavcodec \
         libavformat \
         libavutil \
-        libdvdcss \
         libfaad2 \
         libmpeg2 \
         libpostproc \
@@ -530,6 +535,7 @@
         libaf \
         libao2 \
         libass \
+        libdvdcss \
         libmenu \
         libmpcodecs \
         libmpcodecs/native \
@@ -590,6 +596,8 @@
 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
 	$(WINDRES) -o $@ $<
 
+libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
+
 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
 
 install: install-dirs $(INSTALL_TARGETS)
@@ -755,7 +763,6 @@
 # FIXME: netstream linking is a mess that should be fixed properly some day.
 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
 NETSTREAM_DEPS = dvdread/libdvdread.a \
-                 libdvdcss/libdvdcss.a \
                  libavutil/libavutil.a \
                  m_option.o \
                  m_struct.o \
--- a/libdvdcss/Makefile	Thu Apr 24 22:05:43 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = libdvdcss.a
-
-SRCS_COMMON = css.c \
-              device.c \
-              error.c \
-              ioctl.c \
-              libdvdcss.c \
-              #bsdi_ioctl \
-
-CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
-
-include ../mpcommon.mak