From 481d68007e1efa98cfa6540b187c08f3e3c8f236 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 7 Feb 2009 15:40:07 +0000 Subject: [PATCH] Sync with latest FFmpeg changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28479 b3059339-0415-0410-9bf9-f77b7e298cf2 --- common.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mak b/common.mak index 8ac6ee07ad..4be056c876 100644 --- a/common.mak +++ b/common.mak @@ -48,8 +48,8 @@ ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES)) $(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 @@ TESTS := $(addprefix $(SUBDIR),$(TESTS)) 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)