Give a more meaningful instance name to auto-inserted scaler

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index b809748f3e46f44597b8faad1ec2dd37992274b8..2dc181bcb1f7ebfb676c6e0bb104546dbfc3aeda 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,29 +2,41 @@
 # common bits used by all libraries
 #
 
-VPATH = $(SRC_PATH_BARE)/lib$(NAME)
-SRC_DIR = "$(VPATH)"
+SRC_DIR = $(SRC_PATH_BARE)/lib$(NAME)
+
+LIBVERSION = $(lib$(NAME)_VERSION)
+LIBMAJOR   = $(lib$(NAME)_VERSION_MAJOR)
+
+vpath %.c $(SRC_DIR)
+vpath %.h $(SRC_DIR)
+vpath %.S $(SRC_DIR)
+
+ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 
 CFLAGS   += $(CFLAGS-yes)
 OBJS     += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
 CPP_OBJS += $(CPP_OBJS-yes)
+FFLIBS   += $(FFLIBS-yes)
 
 CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
-          -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+          $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS)
 
-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
-OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
+EXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
+LDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
+
+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)
@@ -44,25 +56,27 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
 %.ho: %.h
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
 
-ALLHEADERS = $(subst $(VPATH)/,,$(wildcard $(VPATH)/*.h))
+ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 
-depend dep: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
+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)"
@@ -79,15 +93,17 @@ install-lib-static: $(LIBNAME)
        install -m 644 $(LIBNAME) "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
-install-headers:
-       install -d "$(INCDIR)"
+INCINSTDIR = $(INCDIR)/lib$(NAME)
+
+install-headers$(DISABLE)::
+       install -d "$(INCINSTDIR)"
        install -d "$(LIBDIR)/pkgconfig"
-       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
+       install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
        install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
 
-uninstall-libs:
+uninstall-libs::
        -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
               "$(SHLIBDIR)/$(SLIBNAME)"            \
               "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
@@ -95,7 +111,7 @@ uninstall-libs:
        -rm -f "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
-       rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
+       rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS))
        rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
 tests: $(TESTS)