Add FFMPEG_ prefix to all multiple inclusion guards.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 8fb66f6ab7fb5f22696055713bf30734ccae83f9..a3940730a7275e395fd19ba269cc3e35e13ab8d5 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -5,15 +5,21 @@
 VPATH = $(SRC_PATH_BARE)/lib$(NAME)
 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 $@
@@ -21,7 +27,7 @@ $(LIB): $(STATIC_OBJS)
        $(RANLIB) $@
 
 $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
-       ln -sf $^ $@
+       $(LN_S) $^ $@
 
 $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
        $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
@@ -33,19 +39,21 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
-# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
-%.o: %.cpp
-       g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
-
 %: %.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,40 +70,38 @@ install: install-libs install-headers
 install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
-       install -d "$(shlibdir)"
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-       cd "$(shlibdir)" && \
-               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-       cd "$(shlibdir)" && \
-               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+       install -d "$(SHLIBDIR)"
+       install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       cd "$(SHLIBDIR)" && \
+               $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+       cd "$(SHLIBDIR)" && \
+               $(LN_S) $(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)"
+       -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"
+uninstall-headers::
+       rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
+       rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend