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

[Jean-Baptiste Kempf]

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
 
 EXTRA_vlc_SOURCES = vlc.c winvlc.c
@@ -33,34 +32,20 @@ vlc_SOURCES = winvlc.c
 noinst_DATA += vlc_win32_rc.rc
 endif
 
-if HAVE_DARWIN
-vlc_osx_SOURCES = darwinvlc.m
-vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa
-if HAVE_BREAKPAD
-vlc_osx_LDFLAGS += -Wl,-framework,Breakpad
-vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)
-endif
-vlc_osx_LDADD = ../lib/libvlc.la
-
-vlc_osx_static_SOURCES = $(vlc_osx_SOURCES)
-vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \
-	-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
-	-DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
-	$(NULL)
-vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static
-vlc_osx_static_LDADD = $(vlc_osx_LDADD)
-if HAVE_BREAKPAD
-vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad
-vlc_osx_static_OBJCFLAGS += -F$(CONTRIB_DIR)
-endif
-endif
-
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
 vlc_LDFLAGS = $(LDFLAGS_vlc)
 vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
 
+if HAVE_DARWIN
+vlc_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,Cocoa
+if HAVE_BREAKPAD
+vlc_LDFLAGS += -Wl,-framework,Breakpad
+vlc_OBJCFLAGS = -F$(CONTRIB_DIR)
+endif
+endif
+
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
 	-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
@@ -70,6 +55,11 @@ vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
+if HAVE_DARWIN
+vlc_static_OBJCFLAGS = $(AM_OBJCFLAGS) $(vlc_static_CFLAGS) $(vlc_OBJCFLAGS)
+vlc_static_LDFLAGS = $(vlc_LDFLAGS) -static
+endif
+
 if HAVE_WIN32
 vlc_LDADD += -lpsapi -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
@@ -101,12 +91,6 @@ endif
 noinst_DATA += ../modules/plugins.dat
 MOSTLYCLEANFILES = $(noinst_DATA)
 
-if HAVE_DARWIN
-install-data-local:
-	cd $(bindir); mv vlc-osx vlc
-
-endif
-
 .PHONY: ../modules/plugins.dat
 
 ../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
diff --git a/extras/package/macosx/build-package.sh b/extras/package/macosx/build-package.sh
index 446f1da..fe628c0 100644
--- a/extras/package/macosx/build-package.sh
+++ b/extras/package/macosx/build-package.sh
@@ -228,8 +228,8 @@ fi
 ##########################
 # Hack for VLC.app
 if [ "$FULL_PRODUCT_NAME" = "VLC.app" ] ; then
-    vlc_install "bin/${prefix}" "vlc-osx" "${target}" "bin" "@loader_path/lib"
-    mv "${target}/vlc-osx" "${target}/VLC"
+    vlc_install "bin/${prefix}" "vlc" "${target}" "bin" "@loader_path/lib"
+    mv "${target}/vlc" "${target}/VLC"
     chmod +x ${target}/VLC
 else
     vlc_install "bin/${prefix}" "vlc" "${target}/bin" "bin" "@loader_path/../lib"
diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index dd39121..8469b8f 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -3,7 +3,7 @@
 VLC-dev.app: VLC-tmp
 	rm -Rf $@
 	cp -R VLC-tmp $@
-	$(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc-osx $@/Contents/MacOS/VLC
+	$(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc $@/Contents/MacOS/VLC
 	$(LN_S) -f ../../../modules $@/Contents/MacOS/plugins
 
 # VLC.app for packaging and giving it to your friends