[vlc-commits] Add -avoid-version to LDFLAGS of vlc and vlccore on OS/2

KO Myung-Hun git at videolan.org
Tue Oct 14 17:14:24 CEST 2014


vlc/vlc-2.2 | branch: master | KO Myung-Hun <komh78 at gmail.com> | Sun Oct 12 14:59:26 2014 +0900| [85836f2c835c85eb00a52dd19d6c51b4c38c574d] | committer: Jean-Baptiste Kempf

Add -avoid-version to LDFLAGS of vlc and vlccore on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 863f851833eab0c4a2b5de354bbf50270a5d8d2b)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=85836f2c835c85eb00a52dd19d6c51b4c38c574d
---

 lib/Makefile.am |    3 +++
 src/Makefile.am |    3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e004b2e..c53fe08 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -66,6 +66,9 @@ if HAVE_WIN32
 libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
 libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
+if HAVE_OS2
+libvlc_la_LDFLAGS += -avoid-version
+endif
 
 pkgconfig_DATA = libvlc.pc
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 32a1e47..0f417f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,6 +192,9 @@ if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
 libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
+if HAVE_OS2
+libvlccore_la_LDFLAGS += -avoid-version
+endif
 if HAVE_DBUS
 libvlccore_la_LIBADD += $(DBUS_LIBS)
 endif



More information about the vlc-commits mailing list