diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | common.mak | 6 | ||||
-rwxr-xr-x | configure | 3 |
3 files changed, 4 insertions, 7 deletions
@@ -1,3 +1,4 @@ +MAIN_MAKEFILE=1 include config.mak vpath %.c $(SRC_PATH) @@ -39,7 +40,6 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) SKIPHEADERS = cmdutils_common_opts.h -MAIN_MAKEFILE=1 include $(SRC_PATH)/common.mak FF_LDFLAGS := $(FFLDFLAGS) diff --git a/common.mak b/common.mak index ddaf45c370..9525dd44b6 100644 --- a/common.mak +++ b/common.mak @@ -7,12 +7,6 @@ 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) @@ -3297,6 +3297,9 @@ BINDIR=\$(DESTDIR)$bindir DATADIR=\$(DESTDIR)$datadir MANDIR=\$(DESTDIR)$mandir SRC_PATH=$source_path +ifndef MAIN_MAKEFILE +SRC_PATH:=\$(SRC_PATH:.%=..%) +endif CC_IDENT=$cc_ident ARCH=$arch CC=$cc |