# HG changeset patch # User diego # Date 1206525517 0 # Node ID 84e71e0a054651a990e6a0899fcd6212c59a037e # Parent 33d94e96abfde8add9020044dc5487b4c7955769 sync with FFmpeg r12599 diff -r 33d94e96abfd -r 84e71e0a0546 common.mak --- a/common.mak Wed Mar 26 00:15:43 2008 +0000 +++ b/common.mak Wed Mar 26 09:58:37 2008 +0000 @@ -2,16 +2,14 @@ # common bits used by all libraries # -LIBSRC = $(SRC_PATH_BARE)/lib$(NAME) +SRC_DIR = $(SRC_PATH_BARE)/lib$(NAME) LIBVERSION = $(lib$(NAME)_VERSION) LIBMAJOR = $(lib$(NAME)_VERSION_MAJOR) -vpath %.c $(LIBSRC) -vpath %.h $(LIBSRC) -vpath %.S $(LIBSRC) - -SRC_DIR = "$(LIBSRC)" +vpath %.c $(SRC_DIR) +vpath %.h $(SRC_DIR) +vpath %.S $(SRC_DIR) ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale @@ -58,18 +56,19 @@ %.ho: %.h $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< -ALLHEADERS = $(subst $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h)) +ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho)) -# gcc stupidly only outputs the basename of targets with -MM -depend dep: $(SRCS) - $(CC) -MM $(CFLAGS) $^ | sed 's,[0-9a-z._-]*: \([a-z0-9]*/\).*,\1&,' 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 @@ -96,15 +95,15 @@ INCINSTDIR = $(INCDIR)/lib$(NAME) -install-headers: +install-headers:: install -d "$(INCINSTDIR)" install -d "$(LIBDIR)/pkgconfig" - install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCINSTDIR)" + 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)"