prevent bitstream reader to be overriden

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 75366e8ed960cc6cf01fcb9b2926f54b3bc0eb51..0961c1740f665408423a1e89f455066d3b419fd5 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
 
 $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
        $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-ifeq ($(CONFIG_MINGW),yes)
-       -lib /machine:i386 /def:$(@:.dll=.def)
-endif
+       $(SLIB_EXTRA_CMD)
 
 %.o: %.c
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
@@ -60,21 +58,18 @@ install: install-libs install-headers
 install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
-       install -d "$(libdir)"
-ifeq ($(CONFIG_MINGW),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
+       install -d "$(shlibdir)"
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               $(libdir)/$(SLIBNAME_WITH_VERSION)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME_WITH_MAJOR)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME)
-endif
+               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       cd "$(shlibdir)" && \
+               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+       cd "$(shlibdir)" && \
+               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
 
 install-lib-static: $(LIB)
        install -d "$(libdir)"
        install -m 644 $(LIB) "$(libdir)"
+       $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
        install -d "$(incdir)"
@@ -85,18 +80,14 @@ install-headers:
 uninstall: uninstall-libs uninstall-headers
 
 uninstall-libs:
-ifeq ($(CONFIG_MINGW),yes)
-       -rm -f $(prefix)/$(SLIBNAME)
-else
-       -rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
-             $(libdir)/$(SLIBNAME)            \
-             $(libdir)/$(SLIBNAME_WITH_VERSION)
-endif
-       -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
+       rm -f "$(addprefix $(incdir)/,$(HEADERS))"
+       rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
 
 #
 # include dependency files if they exist