checkheaders: skip per-arch headers not meant for direct inclusion

Some of the per-arch headers are only meant to be used through
the parent header of the same name.  Testing these standalone
does not make sense.

Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index e7db119be02daf5a7731b0e73704489becf4dc11..93d057274e68e99bc3142f75c36ed6a27bd2867b 100644 (file)
--- 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 c03d0a5711c5a5a09ab89037e22ae8903a5ec8cc..1df1b78542531af1ab60cbd994b85e87954592e8 100644 (file)
--- 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 790c66ef979598fc64853127cbc32f1004c97e8e..ca92959f2631972f74e11662d809b74bd87a90a9 100644 (file)
--- 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