[FFmpeg-cvslog] r22333 - in trunk: Makefile common.mak

[mru]

Author: mru
Date: Mon Mar  8 19:43:38 2010
New Revision: 22333

Log:
Skip cmdutils_common_opts.h fragment in checkheaders

Modified:
   trunk/Makefile
   trunk/common.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Mar  8 19:43:35 2010	(r22332)
+++ trunk/Makefile	Mon Mar  8 19:43:38 2010	(r22333)
@@ -32,6 +32,8 @@ FFLIBS := avutil
 
 DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
 
+SKIPHEADERS = cmdutils_common_opts.h
+
 include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Mon Mar  8 19:43:35 2010	(r22332)
+++ trunk/common.mak	Mon Mar  8 19:43:38 2010	(r22333)
@@ -91,7 +91,7 @@ HOSTPROGS := $(addprefix $(SUBDIR),$(add
 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