[vlc-devel] [vlc-commits] Remove vlc-osx and vlc-osx-static binaries

[David Fuhrmann]

> Am 18.02.2017 um 00:39 schrieb Jean-Baptiste Kempf <git at videolan.org>:
> 
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 18 00:37:26 2017 +0100| [274fb2b2f5a9aac0bb60352effcbdadf022b0fd7] | committer: Jean-Baptiste Kempf
> 
> Remove vlc-osx and vlc-osx-static binaries
> 
> Just use the normal vlc and vlc-static binaries
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=274fb2b2f5a9aac0bb60352effcbdadf022b0fd7
> ---
> 
> Makefile.am                            |  4 ---
> bin/Makefile.am                        | 50 ++++++++++++----------------------
> extras/package/macosx/build-package.sh |  4 +--
> extras/package/macosx/package.mak      |  2 +-
> 4 files changed, 20 insertions(+), 40 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index bd988c7..b7b1a99 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -147,11 +147,7 @@ noinst_SCRIPTS = vlc$(EXEEXT)
> endif
> 
> vlc$(EXEEXT):
> -if HAVE_DARWIN
> -	$(AM_V_GEN)$(LN_S) -f bin/vlc-osx-static vlc
> -else
> 	$(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
> -endif
> 
> TESTS = test/run_vlc.sh
> dist_noinst_SCRIPTS += test/run_vlc.sh
> diff --git a/bin/Makefile.am b/bin/Makefile.am
> index 98ed2c2..8bc3595 100644
> --- a/bin/Makefile.am
> +++ b/bin/Makefile.am
> @@ -1,12 +1,7 @@
> # Building vlc
> #
> -if HAVE_DARWIN
> -bin_PROGRAMS = vlc-osx
> -noinst_PROGRAMS = vlc-osx-static
> -else
> bin_PROGRAMS = vlc
> noinst_PROGRAMS = vlc-static
> -endif
> noinst_DATA =
> vlclib_PROGRAMS = vlc-cache-gen
> EXTRA_PROGRAMS = vlc-wrapper
> @@ -24,7 +19,11 @@ if !HAVE_WIN32
> if !HAVE_OS2
> bin_PROGRAMS += vlc-wrapper
> endif
> +if !HAVE_DARWIN
> vlc_SOURCES = vlc.c override.c
> +else
> +vlc_SOURCES = darwinvlc.m
> +endif
> endif

Hi j-b,

Does that work also for non-osx compilations (windows / linux)? Afaik I introduced vlc-osx especially, because otherwise autotools freaks out if it find „.m“ files together with „.c“ files and it uses the wrong linker, even if the .m files is not actually active.

BR. David