[vlc-commits] macosx_dialog_provider: remove Modules.am

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Jun 24 19:43:53 2015 +0200| [abde9b5b00c182d94a8a27dbdd9fa73d6d57336d] | committer: David Fuhrmann

macosx_dialog_provider: remove Modules.am

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

 configure.ac                                  |    3 ---
 modules/gui/Makefile.am                       |   16 ++++++++++++----
 modules/gui/macosx_dialog_provider/.gitignore |    1 -
 modules/gui/macosx_dialog_provider/Modules.am |   14 --------------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4a6b9d6..9eb2ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3831,10 +3831,8 @@ AC_ARG_ENABLE(macosx-dialog-provider,
 if test "x${enable_macosx_dialog_provider}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes")
 then
-  VLC_ADD_LIBS([macosx_dialog_provider],[-Wl,-framework,Cocoa])
   VLC_ADD_PLUGIN([macosx_dialog_provider])
 fi
-AM_CONDITIONAL(ENABLE_MACOSX_DIALOG_PROVIDER, [test "$enable_macosx_dialog_provider" != "no"])
 
 dnl
 dnl  ncurses module
@@ -4158,7 +4156,6 @@ AC_CONFIG_FILES([
   modules/gui/ios_dialog_provider/Makefile
   modules/gui/macosx/Makefile
   modules/gui/minimal_macosx/Makefile
-  modules/gui/macosx_dialog_provider/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
   modules/hw/mmal/Makefile
diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am
index 6ccc850..fac4dfe 100644
--- a/modules/gui/Makefile.am
+++ b/modules/gui/Makefile.am
@@ -1,14 +1,11 @@
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
 
 if ENABLE_MACOSX_UI
 SUBDIRS += gui/macosx
 endif
-if ENABLE_MACOSX_DIALOG_PROVIDER
-SUBDIRS += gui/macosx_dialog_provider
-endif
 if HAVE_IOS
 SUBDIRS += gui/ios_dialog_provider
 endif
@@ -30,3 +27,14 @@ gui_LTLIBRARIES += libncurses_plugin.la
 endif
 
 EXTRA_DIST += gui/eject.c
+
+
+libmacosx_dialog_provider_plugin_la_SOURCES = \
+	gui/macosx_dialog_provider/VLCLoginPanel.h gui/macosx_dialog_provider/VLCLoginPanel.m \
+	gui/macosx_dialog_provider/VLCProgressPanel.h gui/macosx_dialog_provider/VLCProgressPanel.m \
+	gui/macosx_dialog_provider/VLCUIWidgets.h gui/macosx_dialog_provider/VLCUIWidgets.m \
+	gui/macosx_dialog_provider/dialogProvider.h gui/macosx_dialog_provider/dialogProvider.m
+libmacosx_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-framework,Cocoa
+
+EXTRA_LTLIBRARIES += libmacosx_dialog_provider_plugin.la
+gui_LTLIBRARIES += $(LTLIBmacosx_dialog_provider)
diff --git a/modules/gui/macosx_dialog_provider/.gitignore b/modules/gui/macosx_dialog_provider/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/gui/macosx_dialog_provider/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/macosx_dialog_provider/Modules.am b/modules/gui/macosx_dialog_provider/Modules.am
deleted file mode 100644
index 07263c6..0000000
--- a/modules/gui/macosx_dialog_provider/Modules.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_LIBTOOLFLAGS=--tag=CC
-
-SOURCES_macosx_dialog_provider = \
-    VLCLoginPanel.m \
-    VLCProgressPanel.m \
-    VLCUIWidgets.m \
-	dialogProvider.m \
-	$(NULL)
-
-noinst_HEADERS = \
-	VLCLoginPanel.h \
-	VLCProgressPanel.h \
-	VLCUIWidgets.h \
-	dialogProvider.h