diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-24 09:10:25 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-24 09:39:11 +0200 |
| commit | 95dd1741af2c0416b74135f6ccf40f4bab5583b6 (patch) | |
| tree | 1aaf64340bdbcffe53659d80c34bcb761e402c0d | |
| parent | 2ec899222b3c90b3496a502175baac74cac1f564 (diff) | |
| download | ffmpeg-95dd1741af2c0416b74135f6ccf40f4bab5583b6.tar.gz | |
Allow running make in subdirs again.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | common.mak | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -42,6 +42,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) SKIPHEADERS = cmdutils_common_opts.h +MAIN_MAKEFILE=1 include common.mak FF_LDFLAGS := $(FFLDFLAGS) diff --git a/common.mak b/common.mak index 8d21d154d5..7c03e48091 100644 --- a/common.mak +++ b/common.mak @@ -7,6 +7,12 @@ all: all-yes ifndef SUBDIR +ifndef MAIN_MAKEFILE +ifeq ($(SRC_PATH),.) +SRC_PATH = .. +endif +endif + ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) |