Give a more meaningful instance name to auto-inserted scaler

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index e4e005f03f4378718f51600587da91d94d7e9f12..2dc181bcb1f7ebfb676c6e0bb104546dbfc3aeda 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -26,17 +26,17 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 EXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
 LDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
 
-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
-OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
+SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPP_OBJS:.o=.cpp)
+OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS)
 
 all: $(LIBNAME) $(SLIBNAME)
 
-$(LIBNAME): $(OBJS)
+$(LIBNAME)$(DISABLE): $(OBJS)
        rm -f $@
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
 
-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
+$(SLIBNAME)$(DISABLE): $(SLIBNAME_WITH_MAJOR)
        $(LN_S) $^ $@
 
 $(SLIBNAME_WITH_MAJOR): $(OBJS)
@@ -59,22 +59,24 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
 ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 
-depend dep: $(SRCS)
+depend dep: .depend
+
+.depend: $(SRCS)
        $(DEPEND_CMD) > .depend
 
 clean::
        rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
              *.def *.dll.a *.exp *.ho *.map $(TESTS)
 
-distclean: clean
+distclean:: clean
        rm -f .depend
 
-INSTALL_TARGETS-$(BUILD_SHARED) += install-lib-shared
-INSTALL_TARGETS-$(BUILD_STATIC) += install-lib-static
+INSTALL_LIB_TARGETS-$(BUILD_SHARED) += install-lib-shared
+INSTALL_LIB_TARGETS-$(BUILD_STATIC) += install-lib-static
 
 install: install-libs install-headers
 
-install-libs: $(INSTALL_TARGETS-yes)
+install-libs$(DISABLE): $(INSTALL_LIB_TARGETS-yes)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(SHLIBDIR)"
@@ -93,7 +95,7 @@ install-lib-static: $(LIBNAME)
 
 INCINSTDIR = $(INCDIR)/lib$(NAME)
 
-install-headers:
+install-headers$(DISABLE)::
        install -d "$(INCINSTDIR)"
        install -d "$(LIBDIR)/pkgconfig"
        install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
@@ -101,7 +103,7 @@ install-headers:
 
 uninstall: uninstall-libs uninstall-headers
 
-uninstall-libs:
+uninstall-libs::
        -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
               "$(SHLIBDIR)/$(SLIBNAME)"            \
               "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"