Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / Makefile
index 8b3a51f..cf6c596 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
 SKIPHEADERS = cmdutils_common_opts.h
 
 MAIN_MAKEFILE=1
-include common.mak
+include $(SRC_PATH)/common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
@@ -70,7 +70,7 @@ endef
 define DOSUBDIR
 $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 SUBDIR := $(1)/
-include $(1)/Makefile
+include $(SRC_PATH)/$(1)/Makefile
 endef
 
 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
@@ -147,8 +147,8 @@ config:
 
 check: test
 
-include doc/Makefile
-include tests/Makefile
+include $(SRC_PATH)/doc/Makefile
+include $(SRC_PATH)/tests/Makefile
 
 .PHONY: all alltools *clean check config examples install*
 .PHONY: testprogs uninstall*