Move SRC_PATH hack around to allow compilation from subdir again.

2011-06-30 00:01:14 +02:00 · 2011-06-30 00:01:14 +02:00 · e1a54304be
parent 08b4a667ef
commit e1a54304be
3 changed files with 4 additions and 7 deletions
--- a/2
+++ b/2
@ -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)
--- 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)
--- a/3
+++ b/3
@ -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