virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'

Browse Source 
* 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:
James Almer 2017-04-13 17:22:58 -03:00
commit 27324825de
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -62,6 +62,9 @@ EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examp
SKIPHEADERS = cmdutils_common_opts.h \ SKIPHEADERS = cmdutils_common_opts.h \
compat/w32pthreads.h compat/w32pthreads.h
# first so "all" becomes default target
all: all-yes
include $(SRC_PATH)/tools/Makefile include $(SRC_PATH)/tools/Makefile
include $(SRC_PATH)/common.mak include $(SRC_PATH)/common.mak

3
common.mak
View File

@ -2,9 +2,6 @@
# common bits used by all libraries # common bits used by all libraries
# #
# first so "all" becomes default target
all: all-yes
DEFAULT_YASMD=.dbg DEFAULT_YASMD=.dbg
ifeq ($(DBG),1) ifeq ($(DBG),1)