diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-08 14:39:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-08 14:39:43 +0000 |
| commit | 9b25f4a65ffa71596fc09f6c1f553394c65b4692 (patch) | |
| tree | b9c1c2a65fed98ccd93d803f9b5d7c95ac5f4eee | |
| parent | 5dea940937caacc3baf974b134a961601834e802 (diff) | |
| download | ffmpeg-9b25f4a65ffa71596fc09f6c1f553394c65b4692.tar.gz | |
cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 7 | ||||
| -rw-r--r-- | libavdevice/Makefile | 3 | ||||
| -rw-r--r-- | libavfilter/Makefile | 12 | ||||
| -rw-r--r-- | libavformat/Makefile | 7 | ||||
| -rw-r--r-- | libavutil/Makefile | 4 | ||||
| -rw-r--r-- | libpostproc/Makefile | 3 |
6 files changed, 15 insertions, 21 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4c9a53ec64..7dd93a0bd5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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/pixels_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) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index aef30c0210..9fca3b0467 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -1,7 +1,6 @@ include ../config.mak -NAME=avdevice - +NAME = avdevice FFLIBS = avformat avcodec avutil OBJS = alldevices.o diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 38bd9fa409..83575fe18b 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -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 diff --git a/libavformat/Makefile b/libavformat/Makefile index 3870986d42..3edeb53b4d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o -FFLIBS = avcodec avutil - -NAME=avformat - include ../common.mak diff --git a/libavutil/Makefile b/libavutil/Makefile index 91b437ea87..2ff0a9764f 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -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 diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 26bb5a0922..81a1c943c0 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -1,10 +1,9 @@ include ../config.mak +NAME = postproc FFLIBS = avutil -NAME=postproc - HEADERS = postprocess.h OBJS = postprocess.o |