mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'
* commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b': build: Ensure that the "all" target appears before all Makefile includes Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
27324825de
3
Makefile
3
Makefile
@ -62,6 +62,9 @@ EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examp
|
||||
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
|
||||
|
||||
|
@ -2,9 +2,6 @@
|
||||
# common bits used by all libraries
|
||||
#
|
||||
|
||||
# first so "all" becomes default target
|
||||
all: all-yes
|
||||
|
||||
DEFAULT_YASMD=.dbg
|
||||
|
||||
ifeq ($(DBG),1)
|
||||
|
Loading…
Reference in New Issue
Block a user