aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-08 18:43:38 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-08 18:43:38 +0000
commit9b55e2e7276be0fc7edabafbd26d9c423ff16040 (patch)
tree46b24ad603b34fe49e98b9c8b75b93220faa2187
parent09ad80855c0e65ca11d4ed461bf15d1cbd6f20fa (diff)
downloadffmpeg-9b55e2e7276be0fc7edabafbd26d9c423ff16040.tar.gz
Skip cmdutils_common_opts.h fragment in checkheaders
Originally committed as revision 22333 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile2
-rw-r--r--common.mak2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 00cfc481b1..54a10f6fde 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ FFLIBS := avutil
DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
+SKIPHEADERS = cmdutils_common_opts.h
+
include common.mak
FF_LDFLAGS := $(FFLDFLAGS)
diff --git a/common.mak b/common.mak
index b55e921f54..446ccc1992 100644
--- a/common.mak
+++ b/common.mak
@@ -91,7 +91,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 $(SUBDIR),$(SKIPHEADERS-))
+SKIPHEADERS := $(addprefix $(SUBDIR),$(SKIPHEADERS-) $(SKIPHEADERS))
checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
$(HOSTOBJS): %.o: %.c