From 95f2c769c312909fee539da50fde393aacf57cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sun, 23 Aug 2009 11:02:37 +0000
Subject: [PATCH] Skip headers requiring external libs not present in
 checkheaders

Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile             | 2 +-
 common.mak           | 3 ++-
 libavcodec/Makefile  | 5 +++++
 libavdevice/Makefile | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c3c6d59d8d..6ed50047d5 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@
 	$(STRIP) $@
 
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES \
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS
 
 define RESET
diff --git a/common.mak b/common.mak
index 0551d8e68f..d695f38a8c 100644
--- a/common.mak
+++ b/common.mak
@@ -65,7 +65,8 @@ TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
 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))
-checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
+SKIPHEADERS = $(addprefix $(SUBDIR),$(SKIPHEADERS-))
+checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
 
 DEPS := $(OBJS:.o=.d)
 depend dep: $(DEPS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e370c50084..24e6af4cd8 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -543,6 +543,11 @@ OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.o             \
 OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
                                           sparc/simple_idct_vis.o       \
 
+SKIPHEADERS-$(CONFIG_LIBDIRAC)         += libdirac.h
+SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
+SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
+SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
+SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
 
 EXAMPLES = api
 
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 75607aa2e1..f8380b7611 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -26,4 +26,6 @@ OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
 OBJS-$(CONFIG_AUDIO_BEOS_INDEV)          += beosaudio.o
 OBJS-$(CONFIG_AUDIO_BEOS_OUTDEV)         += beosaudio.o
 
+SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
+
 include $(SUBDIR)../subdir.mak
-- 
GitLab