diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-04-14 13:05:08 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-05-07 14:01:32 +0200 |
| commit | 9eb83a56aad355608ff8ae57648ddcf76e218798 (patch) | |
| tree | aa05fea64fd25c3310d5725317d6dc0a24f16e80 | |
| parent | 1f4f752117c0519345a1b0a725a57440cc8924ec (diff) | |
| download | ffmpeg-9eb83a56aad355608ff8ae57648ddcf76e218798.tar.gz | |
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
| -rw-r--r-- | libavcodec/Makefile | 31 | ||||
| -rw-r--r-- | libavdevice/Makefile | 3 | ||||
| -rw-r--r-- | libavfilter/Makefile | 9 | ||||
| -rw-r--r-- | libavformat/Makefile | 14 | ||||
| -rw-r--r-- | libavutil/Makefile | 25 | ||||
| -rw-r--r-- | libswscale/Makefile | 3 |
6 files changed, 69 insertions, 16 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 367dc1d646..ba62ffa145 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 82268172c3..bc55405470 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 46fa93dc4f..619cef7445 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 681ea1ba9a..9a6cb558ea 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 69f2acd72e..fb19ebf1e2 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 29f3f12793..349dd99789 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -12,4 +12,5 @@ OBJS = input.o \ utils.o \ yuv2rgb.o \ -TESTPROGS = colorspace swscale +TESTPROGS = colorspace \ + swscale \ |