diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 20:17:47 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 20:17:47 +0000 |
| commit | f89c14027a877187eb99767781bd5b12c7516a2a (patch) | |
| tree | 4a07315448ee0f615df3d41bc593487abcc41973 | |
| parent | 4a89e0a6752e737d7e3ce7cb69f2068ef551dc4c (diff) | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 1 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -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 |