summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-12 20:59:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-13 00:05:14 +0100
commitc83ef636a665b2e17f1b6745a98ec7a5719264df (patch)
treed6f1bcc7c841f6865f40367d63ffd59bca456a0a /Makefile
parent31a68ad554a1f6fc54ed1b845866fe480170774f (diff)
build: Disable avconv more completely while leaving the user the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 24fc455f46..c0af5c2c74 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ include $(SRC_PATH)/common.mak
FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS)
-all: $(filter-out avconv, $(PROGS))
+all: $(PROGS)
$(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
$(CP) $< $@$(PROGSSUF)