Trellis quantization support for adpcm_swf.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 7989b9021ebc8cc527bf37a3d6b37e49a94ee72c..bdb707e5009e71a3a80838ced390cf07d05f4bf8 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -8,16 +8,18 @@ SRC_DIR = "$(VPATH)"
 CFLAGS   += $(CFLAGS-yes)
 OBJS     += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
+CPP_OBJS += $(CPP_OBJS-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)
+
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
-all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
+all: $(LIB) $(SLIBNAME)
 
 $(LIB): $(STATIC_OBJS)
        rm -f $@
@@ -40,12 +42,18 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %: %.o $(LIB)
        $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 
+%.ho: %.h
+       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
+
+ALLHEADERS = $(subst $(VPATH)/,,$(wildcard $(VPATH)/*.h))
+checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
+
 depend dep: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 clean::
-       rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.def *.dll.a *.exp
+       rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
+             *.def *.dll.a *.exp *.ho
 
 distclean: clean
        rm -f .depend
@@ -62,37 +70,37 @@ install: install-libs install-headers
 install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
-       install -d "$(shlibdir)"
-       install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-       $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-       cd "$(shlibdir)" && \
+       install -d "$(SHLIBDIR)"
+       install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       cd "$(SHLIBDIR)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-       cd "$(shlibdir)" && \
+       cd "$(SHLIBDIR)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
        $(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib-static: $(LIB)
-       install -d "$(libdir)"
-       install -m 644 $(LIB) "$(libdir)"
+       install -d "$(LIBDIR)"
+       install -m 644 $(LIB) "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
-       install -d "$(incdir)"
-       install -d "$(libdir)/pkgconfig"
-       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
-       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
+       install -d "$(INCDIR)"
+       install -d "$(LIBDIR)/pkgconfig"
+       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
+       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
 
 uninstall-libs:
-       -rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
-              "$(shlibdir)/$(SLIBNAME)"            \
-              "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-       -rm -f "$(libdir)/$(LIB)"
-
-uninstall-headers:
-       rm -f $(addprefix "$(incdir)/",$(HEADERS))
-       rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
+       -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+              "$(SHLIBDIR)/$(SLIBNAME)"            \
+              "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       -rm -f "$(LIBDIR)/$(LIB)"
+
+uninstall-headers::
+       rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
+       rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*