# HG changeset patch # User diego # Date 1234021207 0 # Node ID bffc31262b0e15d79ae5a70be788a20f2a163be2 # Parent ca091f84eb5d7af756abf65fe39cd48c0efbe79b Sync with latest FFmpeg changes. diff -r ca091f84eb5d -r bffc31262b0e common.mak --- a/common.mak Sat Feb 07 15:36:50 2009 +0000 +++ b/common.mak Sat Feb 07 15:40:07 2009 +0000 @@ -48,8 +48,8 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES) endif -$(BUILD_ROOT_REL)/version.h: - $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION) +$(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh + $< $(SRC_PATH) $@ $(EXTRA_VERSION) install: install-libs install-headers @@ -71,7 +71,7 @@ DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME)) -ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h)) +ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho)) DEPS := $(OBJS:.o=.d)