[Ffmpeg-devel] Shared libraries install script broken in cvs

Diego Biurrun diego
Wed Jan 4 15:39:22 CET 2006


On Sat, Dec 17, 2005 at 03:37:02AM +0100, Luca Barbato wrote:
> Luca Barbato wrote:
> >Diego Biurrun wrote:
> >
> >>Please send an updated patch if you notice such a thing.
> >
> >Hopefully a correct one.
> 
> yet another revision, that one should fix some problems introduced by 
> the former.

Some comments below, the patch is broken.

> If some osx user/devel would test it I'd clean up the Makefiles and move 
> the Darwin specific stuff in configure.

Go ahead, I'll test and commit.

> -LIBOBJFLAGS=""
> +LIBOBJFLAGS=""

???

> @@ -228,6 +228,8 @@
>  LIBSUF=".a"
>  SLIBPREF="lib"
>  SLIBSUF=".so"
> +SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
> +SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
>  EXESUF=""
>  BUILDSUF=""
>  amr_nb="no"
> @@ -228,6 +228,8 @@
>  LIBSUF=".a"
>  SLIBPREF="lib"
>  SLIBSUF=".so"
> +SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
> +SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
>  EXESUF=""
>  BUILDSUF=""
>  amr_nb="no"

This hunk is duplicated...

> @@ -339,6 +341,8 @@
>  installstrip=""
>  LDFLAGS="-Wl,-dynamic,-search_paths_first"
>  SLIBSUF=".dylib"
> +SLIBNAME_WITH_FULLVERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
> +SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
>  FFSLDFLAGS=-Wl,-bind_at_load
>  ;;
>  MINGW32*)

What is FULLVERSION for?  It's not used anywhere..

> --- libavcodec/Makefile	10 Dec 2005 17:14:23 -0000	1.215
> +++ libavcodec/Makefile	13 Dec 2005 16:16:03 -0000
> @@ -488,14 +488,20 @@
>  	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
>  
>  ifeq ($(BUILD_SHARED),yes)
> -LIBVERSION=$(LAVCMAJOR)
> +LIBVERSION=$(LAVCVERSION)
> +LIBMAJOR=$(LAVCMAJOR)
> +NAME=avcodec

What are you adding NAME for?  It's never used...

Diego





More information about the ffmpeg-devel mailing list