diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
| commit | 1e869638280f962fb80f372d152234f21246c2af (patch) | |
| tree | 64657f88e7902aa000f44f40be4f8e575f58c8de /common.mak | |
| parent | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff) | |
| parent | 379b176f25905f273a368336c3f5f287eeea51a2 (diff) | |
| download | mpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2 mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz | |
Merge svn changes up to r28537
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 21bd56f93a..82f88fdbee 100644 --- a/common.mak +++ b/common.mak @@ -37,8 +37,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 @@ -60,7 +60,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) |