RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-29 18:53:02 +00:00
Code Issues Projects Releases Wiki Activity

Allow running make in subdirs again.

Browse Source
This commit is contained in:
Reimar Döffinger 2011-06-24 09:10:25 +02:00
parent 2ec899222b
commit 95dd1741af
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -42,6 +42,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
SKIPHEADERS = cmdutils_common_opts.h SKIPHEADERS = cmdutils_common_opts.h
MAIN_MAKEFILE=1
include common.mak include common.mak
FF_LDFLAGS := $(FFLDFLAGS) FF_LDFLAGS := $(FFLDFLAGS)

6
common.mak
View File

@ -7,6 +7,12 @@ all: all-yes
ifndef SUBDIR ifndef SUBDIR
ifndef MAIN_MAKEFILE
ifeq ($(SRC_PATH),.)
SRC_PATH = ..
endif
endif
ifndef V ifndef V
Q = @ Q = @
ECHO = printf "$(1)\t%s\n" $(2) ECHO = printf "$(1)\t%s\n" $(2)