Commit 95f2c769 authored by Måns Rullgård's avatar Måns Rullgård

Skip headers requiring external libs not present in checkheaders

Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 566ae9fb
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment