ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Apr 14 13:05:08 2012 +0200| [9eb83a56aad355608ff8ae57648ddcf76e218798] | committer: Diego Biurrun
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9eb83a56aad355608ff8ae57648ddcf76e218798
---
libavcodec/Makefile | 31 ++++++++++++++++++++++++++-----
libavdevice/Makefile | 3 ++-
libavfilter/Makefile | 9 +++++++--
libavformat/Makefile | 14 +++++++++++---
libavutil/Makefile | 25 +++++++++++++++++++++----
libswscale/Makefile | 3 ++-
6 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 367dc1d..ba62ffa 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,7 +1,14 @@
NAME = avcodec
FFLIBS = avutil
-HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vda.h vdpau.h version.h xvmc.h
+HEADERS = avcodec.h \
+ avfft.h \
+ dxva2.h \
+ vaapi.h \
+ vda.h \
+ vdpau.h \
+ version.h \
+ xvmc.h \
OBJS = allcodecs.o \
audioconvert.o \
@@ -700,13 +707,27 @@ SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h
EXAMPLES = api
-TESTPROGS = cabac dct fft fft-fixed golomb iirfilter rangecoder
+TESTPROGS = cabac \
+ dct \
+ fft \
+ fft-fixed \
+ golomb \
+ iirfilter \
+ rangecoder \
+
TESTPROGS-$(HAVE_MMX) += motion
TESTOBJS = dctref.o
-HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen \
- dv_tablegen motionpixels_tablegen mpegaudio_tablegen \
- pcm_tablegen qdm2_tablegen sinewin_tablegen
+HOSTPROGS = aac_tablegen \
+ aacps_tablegen \
+ cbrt_tablegen \
+ cos_tablegen \
+ dv_tablegen \
+ motionpixels_tablegen \
+ mpegaudio_tablegen \
+ pcm_tablegen \
+ qdm2_tablegen \
+ sinewin_tablegen \
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 8226817..bc55405 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -3,7 +3,8 @@ FFLIBS = avformat avcodec avutil
HEADERS = avdevice.h
-OBJS = alldevices.o avdevice.o
+OBJS = alldevices.o \
+ avdevice.o \
# input/output devices
OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 46fa93d..619cef7 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -2,7 +2,11 @@ NAME = avfilter
FFLIBS = avutil swscale
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
-HEADERS = avfilter.h avfiltergraph.h buffersrc.h version.h vsrc_buffer.h
+HEADERS = avfilter.h \
+ avfiltergraph.h \
+ buffersrc.h \
+ version.h \
+ vsrc_buffer.h \
OBJS = allfilters.o \
avfilter.o \
@@ -68,4 +72,5 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-TOOLS = graph2dot lavfi-showfiltfmts
+TOOLS = graph2dot \
+ lavfi-showfiltfmts \
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 681ea1b..9a6cb55 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,7 +1,9 @@
NAME = avformat
FFLIBS = avcodec avutil
-HEADERS = avformat.h avio.h version.h
+HEADERS = avformat.h \
+ avio.h \
+ version.h \
OBJS = allformats.o \
avio.o \
@@ -352,8 +354,14 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
-EXAMPLES = metadata output
+EXAMPLES = metadata \
+ output \
+
TESTPROGS = seek
-TOOLS = aviocat ismindex pktdumper probetest
+
+TOOLS = aviocat \
+ ismindex \
+ pktdumper \
+ probetest \
$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 69f2acd..fb19ebf 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -37,6 +37,11 @@ HEADERS = adler32.h \
samplefmt.h \
sha.h \
+ARCH_HEADERS = bswap.h \
+ intmath.h \
+ intreadwrite.h \
+ timer.h \
+
BUILT_HEADERS = avconfig.h
OBJS = adler32.o \
@@ -74,7 +79,19 @@ OBJS = adler32.o \
tree.o \
utils.o \
-TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
- md5 opt parseutils sha tree
-
-ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
+TESTPROGS = adler32 \
+ aes \
+ avstring \
+ base64 \
+ cpu \
+ crc \
+ des \
+ eval \
+ fifo \
+ lfg \
+ lls \
+ md5 \
+ opt \
+ parseutils \
+ sha \
+ tree \
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 29f3f12..349dd99 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -12,4 +12,5 @@ OBJS = input.o \
utils.o \
yuv2rgb.o \
-TESTPROGS = colorspace swscale
+TESTPROGS = colorspace \
+ swscale \