Mercurial > mplayer.hg

changeset 28444:bffc31262b0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync with latest FFmpeg changes.
author diego
date Sat, 07 Feb 2009 15:40:07 +0000
parents ca091f84eb5d
children c6cef3c6768f
files common.mak
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)