vlc | branch: master | David Fuhrmann <[email protected]> | Wed Jun 24 19:28:10 2015 +0200| [ff55f00c5363ff76d21897016fd0d5e37cafb7cc] | committer: David Fuhrmann
macosx: Remove Modules.am and add Makefile.am directly > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff55f00c5363ff76d21897016fd0d5e37cafb7cc --- configure.ac | 9 +--- modules/gui/macosx/.gitignore | 1 - modules/gui/macosx/Makefile.am | 72 ++++++++++++++++++++++++++++ modules/gui/macosx/Modules.am | 104 ---------------------------------------- 4 files changed, 73 insertions(+), 113 deletions(-) diff --git a/configure.ac b/configure.ac index 3f6589c..4a6b9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -3784,18 +3784,12 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices]) - VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge]) - if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework then AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}]) fi - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) fi AM_CONDITIONAL(ENABLE_MACOSX_UI, [test "$enable_macosx" != "no"]) @@ -3810,8 +3804,7 @@ then then AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}]) fi - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) + AC_DEFINE([HAVE_SPARKLE], [1], [Define to 1 if sparkle is enabled.]) fi AM_CONDITIONAL(HAVE_SPARKLE, [test "$enable_sparkle" != "no"]) diff --git a/modules/gui/macosx/.gitignore b/modules/gui/macosx/.gitignore deleted file mode 100644 index 08a6d72..0000000 --- a/modules/gui/macosx/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am new file mode 100644 index 0000000..c574e07 --- /dev/null +++ b/modules/gui/macosx/Makefile.am @@ -0,0 +1,72 @@ +include $(top_srcdir)/modules/common.am + +guidir = $(pluginsdir)/gui + + +libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -F${CONTRIB_DIR} +libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \ + -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices \ + -Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook \ + -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration \ + -Wl,-framework,ScriptingBridge -F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit + +if HAVE_SPARKLE +libmacosx_plugin_la_LDFLAGS += -Wl,-framework,Sparkle +endif + +EXTRA_LTLIBRARIES = libmacosx_plugin.la +gui_LTLIBRARIES = $(LTLIBmacosx) + +libmacosx_plugin_la_SOURCES = \ + about.h about.m \ + AddonListDataSource.h AddonListDataSource.m \ + AddonsWindowController.h AddonsWindowController.m \ + applescript.h applescript.m \ + AppleRemote.h AppleRemote.m \ + AudioEffects.h AudioEffects.m \ + bookmarks.h bookmarks.m \ + BWQuincyManager.h BWQuincyManager.m \ + BWQuincyUI.h BWQuincyUI.m \ + CompatibilityFixes.h \ + controls.h controls.m \ + ControlsBar.m ControlsBar.h \ + ConvertAndSave.h ConvertAndSave.m \ + coredialogs.h coredialogs.m \ + CoreInteraction.h CoreInteraction.m \ + DebugMessageVisualizer.h DebugMessageVisualizer.m \ + ExtensionsDialogProvider.h ExtensionsDialogProvider.m \ + ExtensionsManager.h ExtensionsManager.m \ + eyetv.h eyetv.m \ + fspanel.h fspanel.m \ + intf.m intf.h \ + iTunes.h \ + KeyboardBacklight.h KeyboardBacklight.m \ + macosx.m \ + MainMenu.h MainMenu.m \ + MainWindow.h MainWindow.m \ + MainWindowTitle.h MainWindowTitle.m \ + misc.h misc.m \ + open.h open.m \ + output.h output.m \ + playlist.h playlist.m \ + playlistinfo.h playlistinfo.m \ + PLItem.h PLItem.m \ + PLModel.h PLModel.m \ + prefs.h prefs.m \ + prefs_widgets.h prefs_widgets.m \ + PXSourceList.h PXSourceList.m \ + PXSourceListDataSource.h PXSourceListDelegate.h \ + SideBarItem.h SideBarItem.m \ + SharedDialogs.h SharedDialogs.m \ + simple_prefs.h simple_prefs.m \ + SPInvocationGrabbing.h SPInvocationGrabbing.m \ + SPMediaKeyTap.h SPMediaKeyTap.m \ + Spotify.h \ + StringUtility.h StringUtility.m \ + TrackSynchronization.h TrackSynchronization.m \ + VideoEffects.h VideoEffects.m \ + VideoView.h VideoView.m \ + VLCUIWidgets.h VLCUIWidgets.m \ + VLCVoutWindowController.h VLCVoutWindowController.m \ + Windows.h Windows.m \ + wizard.h wizard.m diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am deleted file mode 100644 index 6588a0b..0000000 --- a/modules/gui/macosx/Modules.am +++ /dev/null @@ -1,104 +0,0 @@ -AM_LIBTOOLFLAGS=--tag=CC - -SOURCES_macosx = \ - CompatibilityFixes.h \ - StringUtility.h \ - StringUtility.m \ - AppleRemote.h \ - AppleRemote.m \ - SPInvocationGrabbing.h \ - SPInvocationGrabbing.m \ - SPMediaKeyTap.h \ - SPMediaKeyTap.m \ - MainMenu.h \ - MainMenu.m \ - MainWindow.h \ - MainWindow.m \ - CoreInteraction.h \ - CoreInteraction.m \ - ExtensionsManager.h \ - ExtensionsManager.m \ - ExtensionsDialogProvider.h \ - ExtensionsDialogProvider.m \ - AddonsWindowController.h \ - AddonsWindowController.m \ - AddonListDataSource.h \ - AddonListDataSource.m \ - VLCUIWidgets.h \ - VLCUIWidgets.m \ - about.h \ - about.m \ - applescript.h \ - applescript.m \ - controls.h \ - controls.m \ - coredialogs.m \ - coredialogs.h \ - intf.m \ - intf.h \ - macosx.m \ - misc.m \ - misc.h \ - open.m \ - open.h \ - playlist.m \ - playlist.h \ - playlistinfo.h \ - playlistinfo.m \ - prefs.m \ - prefs.h \ - prefs_widgets.h \ - prefs_widgets.m \ - simple_prefs.h \ - simple_prefs.m \ - output.h \ - output.m \ - wizard.h \ - wizard.m \ - AudioEffects.h \ - AudioEffects.m \ - TrackSynchronization.h \ - TrackSynchronization.m \ - VideoEffects.h \ - VideoEffects.m \ - bookmarks.h \ - bookmarks.m \ - PXSourceList.h \ - PXSourceList.m \ - PXSourceListDataSource.h \ - PXSourceListDelegate.h \ - SideBarItem.h \ - SideBarItem.m \ - fspanel.m \ - fspanel.h \ - eyetv.h \ - eyetv.m \ - VideoView.h \ - VideoView.m \ - MainWindowTitle.h \ - MainWindowTitle.m \ - ConvertAndSave.h \ - ConvertAndSave.m \ - SharedDialogs.h \ - SharedDialogs.m \ - Windows.h \ - Windows.m \ - ControlsBar.m \ - ControlsBar.h \ - VLCVoutWindowController.m \ - VLCVoutWindowController.h \ - DebugMessageVisualizer.m \ - DebugMessageVisualizer.h \ - BWQuincyManager.h \ - BWQuincyManager.m \ - BWQuincyUI.h \ - BWQuincyUI.m \ - iTunes.h \ - Spotify.h \ - PLItem.h \ - PLItem.m \ - PLModel.h \ - PLModel.m \ - KeyboardBacklight.h \ - KeyboardBacklight.m - $(NULL) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
