[vlc-devel] [vlc-commits] commit: libupnp depends on pthreads ( Rafaël Carré )

[Rémi Denis-Courmont]

Le samedi 6 novembre 2010 12:24:27 git at videolan.org, vous avez écrit :
> vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sat Nov  6
> 11:24:07 2010 +0100| [f0ecb0c5c223b34b834f3af4a48d9dd2b979d14d] |
> committer: Rafaël Carré
> 
> libupnp depends on pthreads
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f0ecb0c5c223b34b83
> > 4f3af4a48d9dd2b979d14d
> 
> ---
> 
>  extras/contrib/src/contrib-src.mak |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/extras/contrib/src/contrib-src.mak
> b/extras/contrib/src/contrib-src.mak index 7df2cc9..755512d 100644
> --- a/extras/contrib/src/contrib-src.mak
> +++ b/extras/contrib/src/contrib-src.mak
> @@ -2417,7 +2417,11 @@ ifdef HAVE_WIN32
>  LIBUPNP_ECFLAGS=-DPTW32_STATIC_LIB
>  endif
> 
> +ifdef HAVE_WIN32
> +.libupnp: libupnp .pthreads
> +else
>  .libupnp: libupnp
> +endif

Isn't this more natural?

ifdef HAVE_WIN32
.libupnp:: .pthreads
endif

.libupnp:: libupnp

Note however that depending on 'libupnp' is most likely incorrect. That will 
pass if the directory exists, regardless of the content. Thus it will get into 
inconsistent state if the build is interrupted while unpacking (or patching) 
the source code. This is major bug in the existing contrib build rules.

-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis