From 59903e12fad0b6c23c6667f150bdff15a3369ba0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 26 Nov 2006 22:11:07 +0000 Subject: [PATCH] cosmetics: Move around some entries for better readability. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21288 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/Makefile | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index accbd12bec..37bd9b9056 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -9,21 +9,19 @@ ifeq ($(MENCODER),yes) LIBS+=$(LIBNAME2) endif -SRCS=ad_hwac3.c \ - ad_hwmpa.c \ +SRCS = native/minilzo.c \ + native/nuppelvideo.c \ + native/RTjpegN.c \ + native/xa_gsm.c \ + img_format.c \ -ifeq ($(LIBA52),yes) -SRCS+=ad_liba52.c -endif -ifeq ($(MP3LIB),yes) -SRCS+=ad_mp3lib.c -endif - -SRCS=dec_audio.c \ +SRCS += dec_audio.c \ ad.c \ ad_alaw.c \ ad_dk3adpcm.c \ ad_dvdpcm.c \ + ad_hwac3.c \ + ad_hwmpa.c \ ad_imaadpcm.c \ ad_msadpcm.c \ ad_msgsm.c \ @@ -47,6 +45,9 @@ endif ifeq ($(FAAD),yes) SRCS += ad_faad.c endif +ifeq ($(LIBA52),yes) +SRCS+=ad_liba52.c +endif ifeq ($(LIBDV),yes) SRCS+=ad_libdv.c endif @@ -56,6 +57,9 @@ endif ifeq ($(LIBVORBIS),yes) SRCS+=ad_libvorbis.c endif +ifeq ($(MP3LIB),yes) +SRCS+=ad_mp3lib.c +endif ifeq ($(MUSEPACK),yes) SRCS += ad_mpc.c endif @@ -63,20 +67,14 @@ ifeq ($(SPEEX),yes) SRCS += ad_speex.c endif - -SRCS=vd_lzo.c \ - vd_nuv.c \ - -ifeq ($(LIBMPEG2),yes) -SRCS+=vd_libmpeg2.c -endif - SRCS=dec_video.c \ vd.c \ vd_hmblck.c \ + vd_lzo.c \ vd_mpegpes.c \ vd_mtga.c \ vd_null.c \ + vd_nuv.c \ vd_raw.c \ vd_sgi.c \ @@ -101,6 +99,9 @@ endif ifeq ($(LIBDV),yes) SRCS+=vd_libdv.c endif +ifeq ($(LIBMPEG2),yes) +SRCS+=vd_libmpeg2.c +endif ifeq ($(LIBTHEORA),yes) SRCS+=vd_theora.c endif @@ -272,12 +273,6 @@ LIBAV_INC += -I../libavcodec endif -SRCS+=native/minilzo.c \ - native/nuppelvideo.c \ - native/RTjpegN.c \ - native/xa_gsm.c \ - img_format.c \ - OBJS=$(SRCS:.c=.o) SRCS2=$(ENCODER_SRCS)