[vlc-commits] macOS: factor out the Frameworks path definitions

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 18 00:55:38 2017 +0100| [48691d5637c7595d0d61e9adcca5146bf1e87616] | committer: Jean-Baptiste Kempf

macOS: factor out the Frameworks path definitions

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

 bin/Makefile.am                | 3 +--
 configure.ac                   | 5 ++---
 modules/gui/macosx/Makefile.am | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 8bc3595..2faf646 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -42,7 +42,6 @@ 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
 
@@ -57,7 +56,7 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_DARWIN
 vlc_static_OBJCFLAGS = $(AM_OBJCFLAGS) $(vlc_static_CFLAGS) $(vlc_OBJCFLAGS)
-vlc_static_LDFLAGS = $(vlc_LDFLAGS) -static
+vlc_static_LDFLAGS += -static
 endif
 
 if HAVE_WIN32
diff --git a/configure.ac b/configure.ac
index d4ac16e..4ef5953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,7 +426,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
   CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
   CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
   CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
-  OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
+  OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include -F${CONTRIB_DIR} -F${CONTRIB_DIR}/Frameworks"
   export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
   LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
 
@@ -4133,8 +4133,7 @@ AC_ARG_ENABLE(osx_notifications,
 AS_IF([test "${enable_osx_notifications}" != "no"], [
     AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/Growl.h, [
       VLC_ADD_PLUGIN([osx_notifications])
-      VLC_ADD_LIBS([osx_notifications], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,Foundation])
-      VLC_ADD_OBJCFLAGS([osx_notifications], [-F${CONTRIB_DIR}])
+      VLC_ADD_LIBS([osx_notifications], [-Wl,-framework,Growl,-framework,Foundation])
       VLC_ADD_OBJCFLAGS([osx_notifications], [-fobjc-exceptions] )
     ])
   ]
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index d5894b2..cbc1d45 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -4,13 +4,13 @@ guidir = $(pluginsdir)/gui
 
 SUFFIXES += .xib .nib
 
-libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc -F${CONTRIB_DIR}
+libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc 
 libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
 	-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices \
 	-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,IOKit \
 	-Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio \
 	-Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge \
-	-F${CONTRIB_DIR} -Wl,-framework,QuartzCore
+	-Wl,-framework,QuartzCore
 
 if HAVE_SPARKLE
 libmacosx_plugin_la_LDFLAGS += -Wl,-framework,Sparkle