Fix building from within subdirs
authorMåns Rullgård <mans@mansr.com>
Wed, 20 May 2009 10:24:59 +0000 (10:24 +0000)
committerMåns Rullgård <mans@mansr.com>
Wed, 20 May 2009 10:24:59 +0000 (10:24 +0000)
Originally committed as revision 18881 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak

index 23907af..293a05f 100644 (file)
@@ -71,7 +71,7 @@ EXAMPLES  := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
 OBJS      := $(addprefix $(SUBDIR),$(OBJS))
 TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
 
-DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
+DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
 
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))