Remove MinGW specialcasing and make shared library installation compatible

with MinGW where ln is emulated by cp.

Originally committed as revision 5930 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 19 years ago
parent afa615327b
commit e35a3b7d65
  1. 16
      common.mak

@ -59,16 +59,12 @@ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME) install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)" install -d "$(shlibdir)"
ifeq ($(CONFIG_MINGW),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)" "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
ln -sf $(SLIBNAME_WITH_VERSION) \ cd "$(shlibdir)" && \
"$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
ln -sf $(SLIBNAME_WITH_VERSION) \ cd "$(shlibdir)" && \
"$(shlibdir)/$(SLIBNAME)" ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
endif
install-lib-static: $(LIB) install-lib-static: $(LIB)
install -d "$(libdir)" install -d "$(libdir)"
@ -83,13 +79,9 @@ install-headers:
uninstall: uninstall-libs uninstall-headers uninstall: uninstall-libs uninstall-headers
uninstall-libs: uninstall-libs:
ifeq ($(CONFIG_MINGW),yes)
-rm -f "$(prefix)/$(SLIBNAME)"
else
-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \ -rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
"$(shlibdir)/$(SLIBNAME)" \ "$(shlibdir)/$(SLIBNAME)" \
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)" "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
endif
-rm -f "$(libdir)/$(LIB)" -rm -f "$(libdir)/$(LIB)"
uninstall-headers: uninstall-headers:

Loading…
Cancel
Save