aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-30 00:01:14 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-30 00:02:09 +0200
commite1a54304be1ccbbff2fcd3ee955acfbceb71221f (patch)
treeba1c955659ab11f2fba0f20bed115d5b65f84fed /Makefile
parent08b4a667ef0ed02980a74f3b2174de2040fe1061 (diff)
downloadffmpeg-e1a54304be1ccbbff2fcd3ee955acfbceb71221f.tar.gz
Move SRC_PATH hack around to allow compilation from subdir again.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cf6c596919..dd3a1f6f33 100644
--- a/Makefile
+++ b/Makefile
@@ -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)