[FFmpeg-cvslog] r12364 - in trunk: libavcodec/Makefile libavdevice/Makefile libavfilter/Makefile libavformat/Makefile libavutil/Makefile libpostproc/Makefile

diego subversion
Sat Mar 8 15:39:44 CET 2008


Author: diego
Date: Sat Mar  8 15:39:43 2008
New Revision: 12364

Log:
cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.


Modified:
   trunk/libavcodec/Makefile
   trunk/libavdevice/Makefile
   trunk/libavfilter/Makefile
   trunk/libavformat/Makefile
   trunk/libavutil/Makefile
   trunk/libpostproc/Makefile

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Sat Mar  8 15:39:43 2008
@@ -4,6 +4,9 @@
 #
 include ../config.mak
 
+NAME = avcodec
+FFLIBS = avutil
+
 OBJS = allcodecs.o \
        audioconvert.o \
        bitstream.o \
@@ -454,10 +457,6 @@ ASM_OBJS-$(ARCH_BFIN)                  +
                                           bfin/idct_bfin.o   \
                                           bfin/vp3_idct_bfin.o   \
 
-FFLIBS = avutil
-
-NAME=avcodec
-
 TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
 ifeq ($(ARCH_X86),yes)
 TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)

Modified: trunk/libavdevice/Makefile
==============================================================================
--- trunk/libavdevice/Makefile	(original)
+++ trunk/libavdevice/Makefile	Sat Mar  8 15:39:43 2008
@@ -1,7 +1,6 @@
 include ../config.mak
 
-NAME=avdevice
-
+NAME = avdevice
 FFLIBS = avformat avcodec avutil
 
 OBJS = alldevices.o

Modified: trunk/libavfilter/Makefile
==============================================================================
--- trunk/libavfilter/Makefile	(original)
+++ trunk/libavfilter/Makefile	Sat Mar  8 15:39:43 2008
@@ -1,5 +1,10 @@
 include ../config.mak
 
+NAME = avfilter
+FFLIBS = avcodec avutil
+FFLIBS-$(CONFIG_SWSCALER)      += swscale
+FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
+
 OBJS = allfilters.o \
        avfilter.o \
        defaults.o \
@@ -9,11 +14,4 @@ OBJS = allfilters.o \
 
 HEADERS = avfilter.h
 
-FFLIBS = avcodec avutil
-
-FFLIBS-$(CONFIG_SWSCALER)      += swscale
-FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
-
-NAME=avfilter
-
 include ../common.mak

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Sat Mar  8 15:39:43 2008
@@ -4,6 +4,9 @@
 #
 include ../config.mak
 
+NAME = avformat
+FFLIBS = avcodec avutil
+
 OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
 
 HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
@@ -190,8 +193,4 @@ OBJS-$(CONFIG_RTP_PROTOCOL)             
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
-FFLIBS = avcodec avutil
-
-NAME=avformat
-
 include ../common.mak

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Sat Mar  8 15:39:43 2008
@@ -1,5 +1,7 @@
 include ../config.mak
 
+NAME = avutil
+
 OBJS = adler32.o \
        aes.o \
        base64.o \
@@ -37,8 +39,6 @@ HEADERS = adler32.h \
           rational.h \
           sha1.h
 
-NAME=avutil
-
 TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
 
 include ../common.mak

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Sat Mar  8 15:39:43 2008
@@ -1,10 +1,9 @@
 
 include ../config.mak
 
+NAME = postproc
 FFLIBS = avutil
 
-NAME=postproc
-
 HEADERS = postprocess.h
 
 OBJS = postprocess.o




More information about the ffmpeg-cvslog mailing list