Define HAVE_AV_CONFIG_H for checkheaders in libs

[ffmpeg] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index 2448950630383754e10bbc4ab96206fb799ab78f..8445217ebb500d038e61aa9f7723ed2d8ea69667 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -5,42 +5,46 @@ include $(SUBDIR)../common.mak
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
 
+$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o: CPPFLAGS += -DHAVE_AV_CONFIG_H
+
 ifdef CONFIG_STATIC
 all: $(SUBDIR)$(LIBNAME)
 
 install-libs: install-lib$(NAME)-static
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
-       rm -f $@
+       $(RM) $@
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
 endif
 
+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
+
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
 
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
-       $(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
+       $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)%-test.o: $(SUBDIR)%.c
-       $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+       $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
-       $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+       $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
-       $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
-       $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
+       $$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
+       $$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
 
 clean::
-       rm -f $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+       $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
            $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
            $(HOSTOBJS) $(HOSTPROGS)
 
 distclean:: clean
-       rm -f  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+       $(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
             $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 ifdef CONFIG_SHARED
@@ -49,11 +53,11 @@ all: $(SUBDIR)$(SLIBNAME)
 install-libs: install-lib$(NAME)-shared
 
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
-       cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
+       $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
        $(SLIB_CREATE_DEF_CMD)
-       $(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
+       $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
        $(SLIB_EXTRA_CMD)
 
 ifdef SUBDIR
@@ -62,39 +66,41 @@ endif
 endif
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
-       install -d "$(SHLIBDIR)"
-       install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       cd "$(SHLIBDIR)" && \
+       $(Q)mkdir -p "$(SHLIBDIR)"
+       $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $(Q)cd "$(SHLIBDIR)" && \
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-       cd "$(SHLIBDIR)" && \
+       $(Q)cd "$(SHLIBDIR)" && \
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
        $(SLIB_INSTALL_EXTRA_CMD)
 
+install-lib$(NAME)-static: MSG = $(LIBDIR)/$(LIBNAME)
+install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME)
+
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
-       install -d "$(LIBDIR)"
-       install -m 644 $$< "$(LIBDIR)"
+       $(Q)mkdir -p "$(LIBDIR)"
+       $$(INSTALL) -m 644 $$< "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
-install-headers::
-       install -d "$(INCINSTDIR)"
-       install -d "$(LIBDIR)/pkgconfig"
-       install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
-ifdef BUILT_HEADERS
-       install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
-endif
-       install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
+       $(Q)mkdir -p "$(INCINSTDIR)"
+       $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
+
+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+       $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
+       $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
 
 uninstall-libs::
-       -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+       -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
               "$(SHLIBDIR)/$(SLIBNAME)"            \
               "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        -$(SLIB_UNINSTALL_EXTRA_CMD)
-       -rm -f "$(LIBDIR)/$(LIBNAME)"
+       -$(RM) "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
-       rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS))
-       rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
+       $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS))
+       $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
        -rmdir "$(INCDIR)"
 endef