diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-08-23 11:02:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-08-23 11:02:37 +0000 |
| commit | 95f2c769c312909fee539da50fde393aacf57cc0 (patch) | |
| tree | 7c603542b680411fe3c701222332b587962cd20e | |
| parent | 566ae9fbc293cd0969faec856933ef9bed794db1 (diff) | |
| download | ffmpeg-95f2c769c312909fee539da50fde393aacf57cc0.tar.gz | |
Skip headers requiring external libs not present in checkheaders
Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 | ||||
| -rw-r--r-- | libavdevice/Makefile | 2 |
4 files changed, 10 insertions, 2 deletions
@@ -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 |