[FFmpeg-cvslog] build: Ensure that the "all" target appears before all Makefile includes
Diego Biurrun
git at videolan.org
Thu Apr 13 23:24:39 EEST 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Dec 7 15:27:37 2016 +0100| [c833c2034f4ee77fe2ee3470f3f5f84415673b3b] | committer: Diego Biurrun
build: Ensure that the "all" target appears before all Makefile includes
Otherwise builds without explicit target result in silent no-ops.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c833c2034f4ee77fe2ee3470f3f5f84415673b3b
---
Makefile | 3 +++
common.mak | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b090007f1e..ec04d19d79 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,9 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
SKIPHEADERS = cmdutils_common_opts.h \
compat/w32pthreads.h
+# first so "all" becomes default target
+all: all-yes
+
include $(SRC_PATH)/tools/Makefile
include $(SRC_PATH)/common.mak
diff --git a/common.mak b/common.mak
index 7773693b96..d73addeffe 100644
--- a/common.mak
+++ b/common.mak
@@ -2,9 +2,6 @@
# common bits used by all libraries
#
-# first so "all" becomes default target
-all: all-yes
-
include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes)
More information about the ffmpeg-cvslog
mailing list