aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-12-07 15:27:37 +0100
committerDiego Biurrun <diego@biurrun.de>2016-12-07 15:46:57 +0100
commitc833c2034f4ee77fe2ee3470f3f5f84415673b3b (patch)
treef72142b9f23e323d5bbd115af706d34dd8e8adb9
parent6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a (diff)
downloadffmpeg-c833c2034f4ee77fe2ee3470f3f5f84415673b3b.tar.gz
build: Ensure that the "all" target appears before all Makefile includes
Otherwise builds without explicit target result in silent no-ops.
-rw-r--r--Makefile3
-rw-r--r--common.mak3
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)