[MPlayer-cvslog] r21286 - trunk/libmpcodecs/Makefile
diego
subversion at mplayerhq.hu
Sun Nov 26 22:55:42 CET 2006
Author: diego
Date: Sun Nov 26 22:55:40 2006
New Revision: 21286
Modified:
trunk/libmpcodecs/Makefile
Log:
Reorder entries for better readability.
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Sun Nov 26 22:55:40 2006
@@ -59,6 +59,12 @@
ifeq ($(LIBVORBIS),yes)
AUDIO_SRCS+=ad_libvorbis.c
endif
+ifeq ($(MUSEPACK),yes)
+AUDIO_SRCS += ad_mpc.c
+endif
+ifeq ($(SPEEX),yes)
+AUDIO_SRCS += ad_speex.c
+endif
VIDEO_SRCS_LIB=vd_lzo.c \
@@ -110,6 +116,12 @@
ifeq ($(ZORAN),yes)
VIDEO_SRCS+=vd_zrmjpeg.c
endif
+ifeq ($(PNG),yes)
+VIDEO_SRCS += vd_mpng.c
+endif
+ifeq ($(JPEG),yes)
+VIDEO_SRCS += vd_ijpg.c
+endif
VFILTER_SRCS=vf.c \
@@ -194,7 +206,6 @@
ifeq ($(CONFIG_LIBPOSTPROC_SO),yes)
VFILTER_SRCS += vf_pp.c
endif
-
ifeq ($(CONFIG_LIBAVCODEC),yes)
VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
VFILTER_SRCS += $(VFILTER_LAVC_DSPUTIL_SRCS)
@@ -202,10 +213,15 @@
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
endif
-
ifeq ($(PNG),yes)
VFILTER_SRCS += vf_screenshot.c
endif
+ifeq ($(ZORAN),yes)
+VFILTER_SRCS += vf_zrmjpeg.c
+endif
+ifeq ($(CONFIG_ASS),yes)
+VFILTER_SRCS += vf_ass.c
+endif
ENCODER_SRCS=ae.c \
@@ -235,63 +251,37 @@
ifeq ($(X264),yes)
ENCODER_SRCS+=ve_x264.c
endif
-
-
-NATIVE_SRCS=native/minilzo.c \
- native/nuppelvideo.c \
- native/RTjpegN.c \
- native/xa_gsm.c \
-
-ifeq ($(ZORAN),yes)
-VFILTER_SRCS += vf_zrmjpeg.c
-endif
-
-ifeq ($(PNG),yes)
-VIDEO_SRCS += vd_mpng.c
-endif
-
-ifeq ($(JPEG),yes)
-VIDEO_SRCS += vd_ijpg.c
-endif
-
ifeq ($(TOOLAME),yes)
ENCODER_SRCS += ae_toolame.c
endif
-
ifeq ($(TWOLAME),yes)
ENCODER_SRCS += ae_twolame.c
endif
-
ifeq ($(MP3LAME),yes)
ENCODER_SRCS += ae_lame.c
endif
-
-ifeq ($(CONFIG_LIBAVUTIL),yes)
-LIBAV_INC += -I../libavutil
+ifeq ($(FAAC),yes)
+ENCODER_SRCS += ae_faac.c
endif
-ifeq ($(CONFIG_LIBAVCODEC),yes)
-LIBAV_INC += -I../libavcodec
+ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
ENCODER_SRCS += ae_lavc.c
endif
-ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
+ifeq ($(CONFIG_LIBAVCODEC),yes)
ENCODER_SRCS += ae_lavc.c
endif
-ifeq ($(MUSEPACK),yes)
-AUDIO_SRCS += ad_mpc.c
+ifeq ($(CONFIG_LIBAVUTIL),yes)
+LIBAV_INC += -I../libavutil
endif
-
-ifeq ($(SPEEX),yes)
-AUDIO_SRCS += ad_speex.c
+ifeq ($(CONFIG_LIBAVCODEC),yes)
+LIBAV_INC += -I../libavcodec
endif
-ifeq ($(FAAC),yes)
-ENCODER_SRCS += ae_faac.c
-endif
-ifeq ($(CONFIG_ASS),yes)
-VFILTER_SRCS += vf_ass.c
-endif
+NATIVE_SRCS=native/minilzo.c \
+ native/nuppelvideo.c \
+ native/RTjpegN.c \
+ native/xa_gsm.c \
SRCS=$(AUDIO_SRCS) \
$(VIDEO_SRCS) \
More information about the MPlayer-cvslog
mailing list