diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-07 15:40:07 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-07 15:40:07 +0000 |
| commit | 481d68007e1efa98cfa6540b187c08f3e3c8f236 (patch) | |
| tree | 6385748b6a13572ba6ce7d2e93a2adbc6a2e17fc /common.mak | |
| parent | 38daeba8f8461daca437cb755fe402c9daa0517d (diff) | |
| download | mpv-481d68007e1efa98cfa6540b187c08f3e3c8f236.tar.bz2 mpv-481d68007e1efa98cfa6540b187c08f3e3c8f236.tar.xz | |
Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28479 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 6 |
1 files 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) |