[Ffmpeg-cvslog] r7709 - in trunk: Makefile common.mak configure

[diego]

Author: diego
Date: Thu Jan 25 13:29:48 2007
New Revision: 7709

Modified:
   trunk/Makefile
   trunk/common.mak
   trunk/configure

Log:
Remove installstrip in favor of explicit strip; better for cross-compilation.
patch by Ramiro Ribeiro Polla, ramiro lisha.ufsc br


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Jan 25 13:29:48 2007
@@ -124,7 +124,7 @@
 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

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Thu Jan 25 13:29:48 2007
@@ -63,8 +63,8 @@
 
 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)" && \

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Jan 25 13:29:48 2007
@@ -668,7 +668,6 @@
 debug="yes"
 extrawarnings="no"
 dostrip="yes"
-installstrip="-s"
 extralibs="-lm"
 bigendian="no"
 vhook="default"
@@ -810,7 +809,6 @@
 extralibs="-lpoll -lgnugetopt -lm"
 make="gmake"
 strip="strip -d"
-installstrip=""
 ;;
 Darwin)
 cc="cc"
@@ -823,7 +821,6 @@
 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 "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