[FFmpeg-cvslog] r22341 - in trunk: Makefile common.mak libavutil/Makefile

[mru]

Author: mru
Date: Mon Mar  8 21:17:47 2010
New Revision: 22341

Log:
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.

Modified:
   trunk/Makefile
   trunk/common.mak
   trunk/libavutil/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Mar  8 20:59:54 2010	(r22340)
+++ trunk/Makefile	Mon Mar  8 21:17:47 2010	(r22341)
@@ -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) :=

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Mon Mar  8 20:59:54 2010	(r22340)
+++ trunk/common.mak	Mon Mar  8 21:17:47 2010	(r22341)
@@ -92,6 +92,7 @@ HOSTPROGS := $(addprefix $(SUBDIR),$(add
 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))
 

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	Mon Mar  8 20:59:54 2010	(r22340)
+++ trunk/libavutil/Makefile	Mon Mar  8 21:17:47 2010	(r22341)
@@ -50,6 +50,8 @@ TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += 
 
 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