Remove installstrip in favor of explicit strip; better for cross-compilation.
authorRamiro Polla <ramiro@lisha.ufsc.br>
Thu, 25 Jan 2007 12:29:48 +0000 (12:29 +0000)
committerDiego Biurrun <diego@biurrun.de>
Thu, 25 Jan 2007 12:29:48 +0000 (12:29 +0000)
patch by Ramiro Ribeiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7709 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
common.mak
configure

index b2d7575..a4b0a37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ else
 install-progs: $(PROGS)
 endif
        install -d "$(bindir)"
-       install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
+       install -c -m 755 $(PROGS) "$(bindir)"
 
 # Create the Windows installer.
 wininstaller: all install
index 0d5fdce..1a80833 100644 (file)
@@ -63,8 +63,8 @@ install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(shlibdir)"
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
        cd "$(shlibdir)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
        cd "$(shlibdir)" && \
index 0ab65a9..18aad8c 100755 (executable)
--- a/configure
+++ b/configure
@@ -668,7 +668,6 @@ optimize="yes"
 debug="yes"
 extrawarnings="no"
 dostrip="yes"
-installstrip="-s"
 extralibs="-lm"
 bigendian="no"
 vhook="default"
@@ -810,7 +809,6 @@ dv1394="no"
 extralibs="-lpoll -lgnugetopt -lm"
 make="gmake"
 strip="strip -d"
-installstrip=""
 ;;
 Darwin)
 cc="cc"
@@ -823,7 +821,6 @@ SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNA
 VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
 extralibs=""
 strip="strip -x"
-installstrip=""
 FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
 SLIBSUF=".dylib"
 SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
@@ -1914,10 +1911,8 @@ echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
 if test "$dostrip" = "yes" ; then
     echo "STRIP=$strip" >> config.mak
-    echo "INSTALLSTRIP=$installstrip" >> config.mak
 else
     echo "STRIP=echo ignoring strip" >> config.mak
-    echo "INSTALLSTRIP=" >> config.mak
 fi
 
 echo "OPTFLAGS=$CFLAGS" >> config.mak