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

Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4c9a53e..7dd93a0 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -4,6 +4,9 @@
 #
 include ../config.mak
 
 #
 include ../config.mak
 

+NAME = avcodec
+FFLIBS = avutil
+

 OBJS = allcodecs.o \
        audioconvert.o \
        bitstream.o \
 OBJS = allcodecs.o \
        audioconvert.o \
        bitstream.o \


@@ -454,10 +457,6 @@ ASM_OBJS-$(ARCH_BFIN)                  += bfin/pixels_bfin.o \
                                           bfin/idct_bfin.o   \
                                           bfin/vp3_idct_bfin.o   \
 
                                           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)
 TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
 ifeq ($(ARCH_X86),yes)
 TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index aef30c0..9fca3b0 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,7 +1,6 @@
 include ../config.mak
 
 include ../config.mak
 

-NAME=avdevice
-
+NAME = avdevice

 FFLIBS = avformat avcodec avutil
 
 OBJS = alldevices.o
 FFLIBS = avformat avcodec avutil
 
 OBJS = alldevices.o

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 38bd9fa..83575fe 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,5 +1,10 @@
 include ../config.mak
 
 include ../config.mak
 

+NAME = avfilter
+FFLIBS = avcodec avutil
+FFLIBS-$(CONFIG_SWSCALER)      += swscale
+FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
+

 OBJS = allfilters.o \
        avfilter.o \
        defaults.o \
 OBJS = allfilters.o \
        avfilter.o \
        defaults.o \


@@ -9,11 +14,4 @@ OBJS = allfilters.o \
 
 HEADERS = avfilter.h
 
 
 HEADERS = avfilter.h
 

-FFLIBS = avcodec avutil
-
-FFLIBS-$(CONFIG_SWSCALER)      += swscale
-FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
-
-NAME=avfilter
-

 include ../common.mak
 include ../common.mak

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 3870986..3edeb53 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,6 +4,9 @@
 #
 include ../config.mak
 
 #
 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
 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)              += rtpproto.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 

-FFLIBS = avcodec avutil
-
-NAME=avformat
-

 include ../common.mak
 include ../common.mak

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 91b437e..2ff0a97 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,5 +1,7 @@
 include ../config.mak
 
 include ../config.mak
 

+NAME = avutil
+

 OBJS = adler32.o \
        aes.o \
        base64.o \
 OBJS = adler32.o \
        aes.o \
        base64.o \


@@ -37,8 +39,6 @@ HEADERS = adler32.h \
           rational.h \
           sha1.h
 
           rational.h \
           sha1.h
 

-NAME=avutil
-

 TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
 
 include ../common.mak
 TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
 
 include ../common.mak

diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 26bb5a0..81a1c94 100644 (file)
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -1,10 +1,9 @@
 
 include ../config.mak
 
 
 include ../config.mak
 

+NAME = postproc

 FFLIBS = avutil
 
 FFLIBS = avutil
 

-NAME=postproc
-

 HEADERS = postprocess.h
 
 OBJS = postprocess.o
 HEADERS = postprocess.h
 
 OBJS = postprocess.o