summaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak6
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)