[vlc-commits] macosx: fix linking of cdda, vcd, and vcdx access modules

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Sep 18 19:10:34 2013 +0200| [146bbc8218e0a19052c1dc06c7590eb7fe83adf4] | committer: Jean-Baptiste Kempf

macosx: fix linking of cdda, vcd, and vcdx access modules

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=146bbc8218e0a19052c1dc06c7590eb7fe83adf4
---

 configure.ac               |    8 +-------
 modules/access/Makefile.am |    9 +++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6a058a0..e169dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1851,17 +1851,11 @@ then
     AC_MSG_RESULT(no)
   ])
 
-  if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" -o "${SYS}" = "os2"
+  if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" -o "${SYS}" = "os2" -o "${SYS}" = "darwin"
   then
     VLC_ADD_PLUGIN([vcd cdda])
   fi
 
-  if test "${SYS}" = "darwin"
-  then
-    VLC_ADD_PLUGIN([vcd cdda])
-    VLC_ADD_LIBS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation])
-  fi
-
   if test "$enable_libcddb" != "no"; then
     PKG_CHECK_MODULES(LIBCDDB, [libcddb >= 0.9.5], [
       HAVE_LIBCDDB=yes
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 2e95ae1..9bc48af 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -212,18 +212,20 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
 libcdda_plugin_la_SOURCES = access/cdda.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
 libcdda_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBCDDB_CFLAGS)
 libcdda_plugin_la_LIBADD = $(LIBCDDB_LIBS)
+libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 if HAVE_DARWIN
 libcdda_plugin_la_LIBADD += -liconv
+libcdda_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 EXTRA_LTLIBRARIES += libcdda_plugin.la
 access_LTLIBRARIES += $(LTLIBcdda)
 
 libvcd_plugin_la_SOURCES = access/vcd/vcd.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
+libvcd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 if HAVE_DARWIN
 libvcd_plugin_la_LIBADD = -liconv
+libvcd_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-libvcd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 EXTRA_LTLIBRARIES += libvcd_plugin.la
 access_LTLIBRARIES += $(LTLIBvcd)
 
@@ -237,6 +239,9 @@ if HAVE_WIN32
 libvcdx_plugin_la_LIBADD = -lwinmm
 endif
 libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
+if HAVE_DARWIN
+libvcdx_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
+endif
 EXTRA_LTLIBRARIES += libvcdx_plugin.la
 access_LTLIBRARIES += $(LTLIBvcdx)