summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-02-16 17:58:50 +0100
committerDiego Biurrun <diego@biurrun.de>2016-04-07 15:26:08 +0200
commit01621202aad7e27b2a05c71d9ad7a19dfcbe17ec (patch)
tree125d182402e78d17ed8312303da9a9a591ac3623 /Makefile
parente656a6ccd9cab1b0a79cffe3e609793857aae330 (diff)
downloadffmpeg-01621202aad7e27b2a05c71d9ad7a19dfcbe17ec.tar.gz
build: miscellaneous cosmetics
Restore alphabetical order in lists, break overly long lines, do some prettyprinting, add some explanatory section comments, group parts together that belong together logically.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c06d862011..96ad55d8dc 100644
--- a/Makefile
+++ b/Makefile
@@ -82,11 +82,11 @@ ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF))
$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
OBJS-avconv += avconv_opt.o avconv_filter.o
-OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
-OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
-OBJS-avconv-$(CONFIG_VDA) += avconv_vda.o
OBJS-avconv-$(CONFIG_LIBMFX) += avconv_qsv.o
OBJS-avconv-$(CONFIG_VAAPI) += avconv_vaapi.o
+OBJS-avconv-$(CONFIG_VDA) += avconv_vda.o
+OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
+OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
@@ -105,7 +105,8 @@ FFLIBS := avutil
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
-SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
+SKIPHEADERS = cmdutils_common_opts.h \
+ compat/w32pthreads.h
include $(SRC_PATH)/common.mak