X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common.mak;h=8fb66f6ab7fb5f22696055713bf30734ccae83f9;hb=aeeb0cac3d8ace239ce1fe0d98858ebbd37029a7;hp=21b2273da4f9cd8f283b3896df4064fbe90d0826;hpb=dadb850a50f75cc9149e394878c2341e73f58770;p=ffmpeg

diff --git a/common.mak b/common.mak
index 21b2273da4f..8fb66f6ab7f 100644
--- a/common.mak
+++ b/common.mak
@@ -2,8 +2,8 @@
 # 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 += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
@@ -13,8 +13,6 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
 all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
 
 $(LIB): $(STATIC_OBJS)
@@ -47,7 +45,7 @@ depend dep: $(SRCS)
 
 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
@@ -71,6 +69,7 @@ install-lib-shared: $(SLIBNAME)
 		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)"
@@ -80,7 +79,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
@@ -97,9 +96,6 @@ uninstall-headers:
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-#
-# include dependency files if they exist
-#
 ifneq ($(wildcard .depend),)
 include .depend
 endif