readability cosmetics

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 9211db57659001bf055601fc8cc76929629b11b1..43bcc57355df48d4aed67be28130ffc4168a6b1c 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,8 +2,17 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/lib$(NAME)
-VPATH = $(SRC_DIR)
+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)
@@ -30,18 +39,15 @@ $(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)
 
-depend: $(SRCS)
+depend dep: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dep:   depend
-
 clean::
        rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.lib *.def *.dll.a *.exp
+             *.def *.dll.a *.exp
 
 distclean: clean
        rm -f .depend
@@ -59,12 +65,13 @@ install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(shlibdir)"
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       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)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+       $(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib-static: $(LIB)
        install -d "$(libdir)"
@@ -74,7 +81,7 @@ install-lib-static: $(LIB)
 install-headers:
        install -d "$(incdir)"
        install -d "$(libdir)/pkgconfig"
-       install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
+       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
        install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
@@ -86,14 +93,9 @@ uninstall-libs:
        -rm -f "$(libdir)/$(LIB)"
 
 uninstall-headers:
-       rm -f "$(addprefix $(incdir)/,$(HEADERS))"
+       rm -f $(addprefix "$(incdir)/",$(HEADERS))
        rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend