diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-24 22:27:01 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-24 22:27:01 +0000 |
| commit | 4267826b6bde2f18beed0637181cba5b5f814fde (patch) | |
| tree | 48c77e438b60f1323557f2e3ebf7d0a6bcf140cc /Makefile | |
| parent | aaf2c51e8abb42a3fda320ca626d4258a54d05ad (diff) | |
| download | mpv-4267826b6bde2f18beed0637181cba5b5f814fde.tar.bz2 mpv-4267826b6bde2f18beed0637181cba5b5f814fde.tar.xz | |
Merge libdvdcss/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -261,6 +261,13 @@ SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c 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-$(LIBA52) += liba52/liba52.a 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 @@ PARTS = dvdread \ libavcodec \ libavformat \ libavutil \ - libdvdcss \ libfaad2 \ libmpeg2 \ libpostproc \ @@ -530,6 +535,7 @@ DIRS = gui \ libaf \ libao2 \ libass \ + libdvdcss \ libmenu \ libmpcodecs \ libmpcodecs/native \ @@ -590,6 +596,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o 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 @@ fastmemcpybench realcodecs: CFLAGS += -g # 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 \ |