diff options
| author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2006-12-22 05:29:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-12-22 05:29:14 +0000 |
| commit | 8fbec4f4d0e10dec451fce5f8f62908d4896170a (patch) | |
| tree | e099625bbc5bc23655c61a0338d78a01becfafb8 | |
| parent | 754e97fa49e3d0b91ca4a588158be39159e04134 (diff) | |
Install generated .lib files in shlibdir on MinGW.
patch by Ramiro Polla, ramiro lisha.ufsc br
Originally committed as revision 7356 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 1 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/common.mak b/common.mak index d4a8dca416..8fb66f6ab7 100644 --- a/common.mak +++ b/common.mak @@ -69,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)" @@ -1092,6 +1092,7 @@ EOF SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" + SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"${shlibdir}/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\"" SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc" fi @@ -1945,6 +1946,7 @@ if test "$lshared" = "yes" ; then echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak + echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak fi echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak echo "EXTRALIBS=$extralibs" >> config.mak |