Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 17 years ago
parent 5dea940937
commit 9b25f4a65f
6 changed files with 15 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavcodec/Makefile
  2. 1
      libavdevice/Makefile
  3. 12
      libavfilter/Makefile
  4. 7
      libavformat/Makefile
  5. 4
      libavutil/Makefile
  6. 3
      libpostproc/Makefile

7
libavcodec/Makefile
Unescape View File

@ -4,6 +4,9 @@
# #
include ../config.mak include ../config.mak
NAME = avcodec
FFLIBS = avutil
OBJS = allcodecs.o \ OBJS = allcodecs.o \
audioconvert.o \ audioconvert.o \
bitstream.o \ bitstream.o \
@ -454,10 +457,6 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
bfin/idct_bfin.o \ bfin/idct_bfin.o \
bfin/vp3_idct_bfin.o \ bfin/vp3_idct_bfin.o \
FFLIBS = avutil
NAME=avcodec
TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow) TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
ifeq ($(ARCH_X86),yes) ifeq ($(ARCH_X86),yes)
TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF) TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)

1
libavdevice/Makefile
Unescape View File

@ -1,7 +1,6 @@
include ../config.mak include ../config.mak
NAME = avdevice NAME = avdevice
FFLIBS = avformat avcodec avutil FFLIBS = avformat avcodec avutil
OBJS = alldevices.o OBJS = alldevices.o

12
libavfilter/Makefile
Unescape View File

@ -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 \ OBJS = allfilters.o \
avfilter.o \ avfilter.o \
defaults.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

7
libavformat/Makefile
Unescape View File

@ -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 OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
HEADERS = avformat.h avio.h rtsp.h rtspcodes.h 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_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
FFLIBS = avcodec avutil
NAME=avformat
include ../common.mak include ../common.mak

4
libavutil/Makefile
Unescape View File

@ -1,5 +1,7 @@
include ../config.mak include ../config.mak
NAME = avutil
OBJS = adler32.o \ OBJS = adler32.o \
aes.o \ aes.o \
base64.o \ base64.o \
@ -37,8 +39,6 @@ HEADERS = adler32.h \
rational.h \ rational.h \
sha1.h sha1.h
NAME=avutil
TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree) TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
include ../common.mak include ../common.mak

3
libpostproc/Makefile
Unescape View File

@ -1,9 +1,8 @@
include ../config.mak include ../config.mak
FFLIBS = avutil
NAME = postproc NAME = postproc
FFLIBS = avutil
HEADERS = postprocess.h HEADERS = postprocess.h

Write Preview
Loading…
Cancel
Save