summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--common.mak1
-rw-r--r--libavutil/Makefile2
3 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e7db119be0..93d057274e 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
- HOSTPROGS BUILT_HEADERS TESTOBJS
+ HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS
define RESET
$(1) :=
diff --git a/common.mak b/common.mak
index c03d0a5711..1df1b78542 100644
--- a/common.mak
+++ b/common.mak
@@ -92,6 +92,7 @@ HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS)))
DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
+SKIPHEADERS += $(addprefix $(ARCH)/,$(ARCH_HEADERS))
SKIPHEADERS := $(addprefix $(SUBDIR),$(SKIPHEADERS-) $(SKIPHEADERS))
checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 790c66ef97..ca92959f26 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -50,6 +50,8 @@ TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
DIRS = arm bfin sh4 x86
+ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
+
include $(SUBDIR)../subdir.mak
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2