[MPlayer-cvslog] r31400 - trunk/Makefile

[diego]

Author: diego
Date: Mon Jun 14 13:15:21 2010
New Revision: 31400

Log:
Revert linking vd_zrmjpeg.c and vf_zrmjpeg.c to MPlayer only.
Currently linking decoders or filters to just one program is not possible.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Jun 14 13:11:41 2010	(r31399)
+++ trunk/Makefile	Mon Jun 14 13:15:21 2010	(r31400)
@@ -326,7 +326,8 @@ SRCS_COMMON-$(WIN32DLL)              += 
 SRCS_COMMON-$(XANIM_CODECS)          += libmpcodecs/vd_xanim.c
 SRCS_COMMON-$(XMMS_PLUGINS)          += libmpdemux/demux_xmms.c
 SRCS_COMMON-$(XVID4)                 += libmpcodecs/vd_xvid4.c
-
+SRCS_COMMON-$(ZR)                    += libmpcodecs/vd_zrmjpeg.c \
+                                        libmpcodecs/vf_zrmjpeg.c
 SRCS_COMMON = asxparser.c \
               codec-cfg.c \
               cpudetect.c \
@@ -661,9 +662,7 @@ SRCS_MPLAYER-$(XVIDIX)        += libvo/v
 SRCS_MPLAYER-$(XVMC)          += libvo/vo_xvmc.c
 SRCS_MPLAYER-$(XVR100)        += libvo/vo_xvr100.c
 SRCS_MPLAYER-$(YUV4MPEG)      += libvo/vo_yuv4mpeg.c
-SRCS_MPLAYER-$(ZR)            += libmpcodecs/vd_zrmjpeg.c \
-                                 libmpcodecs/vf_zrmjpeg.c \
-                                 libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
+SRCS_MPLAYER-$(ZR)            += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
 
 SRCS_MPLAYER = command.c \
                m_property.c \