[FFmpeg-devel] [PATCH] checkheaders: Fix directory creation in out-of-tree builds.

Alexander Strasser eclipse7 at gmx.net
Sun Aug 5 02:40:46 CEST 2012


Hi
 
jamal wrote:
> checkheaders wasn't creating folders as needed, so if it was run
> immediately after the configure script it would fail as soon as
> it tried to compile headers inside the ARCH folders.
> ---
>  common.mak |   14 ++++++++------
>  1 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/common.mak b/common.mak
> index e306cef..43d2091 100644
> --- a/common.mak
> +++ b/common.mak
> @@ -96,7 +96,8 @@ DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)
>  ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
>  SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
>  SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
> -checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
> +HEADEROBJS  := $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
> +checkheaders:  $(HEADEROBJS)
>  
>  alltools: $(TOOLS)
>  
> @@ -106,12 +107,13 @@ $(HOSTOBJS): %.o: %.c
>  $(HOSTPROGS): %$(HOSTEXESUF): %.o
>  	$(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
>  
> -$(OBJS):     | $(sort $(dir $(OBJS)))
> -$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
> -$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
> -$(TOOLOBJS): | tools
> +$(OBJS):       | $(sort $(dir $(OBJS)))
> +$(HOSTOBJS):   | $(sort $(dir $(HOSTOBJS)))
> +$(TESTOBJS):   | $(sort $(dir $(TESTOBJS)))
> +$(HEADEROBJS): | $(sort $(dir $(HEADEROBJS)))
> +$(TOOLOBJS):   | tools
>  
> -OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS))
> +OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS) $(HEADEROBJS))

  Should be fine. I will push in a few days.

Thank you,
  Alexander


More information about the ffmpeg-devel mailing list