[SCM] libav/experimental: Fix building from within subdirs
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:46:09 UTC 2013
The following commit has been merged in the experimental branch:
commit b4c80b649e72f394853a17966cfe501942bd2941
Author: Måns Rullgård <mans at mansr.com>
Date: Wed May 20 10:24:59 2009 +0000
Fix building from within subdirs
Originally committed as revision 18881 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/common.mak b/common.mak
index 23907af..293a05f 100644
--- a/common.mak
+++ b/common.mak
@@ -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))
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list