[vlc-commits] minimal_macosx: Remove Modules.am

[David Fuhrmann]

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

minimal_macosx: Remove Modules.am

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

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

diff --git a/configure.ac b/configure.ac
index 9eb2ec5..ba8aa2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3817,11 +3817,8 @@ AC_ARG_ENABLE(minimal-macosx,
   [  --enable-minimal-macosx Minimal Mac OS X support (default disabled)])
 if test "${enable_minimal_macosx}" = "yes" -a "${SYS}" = "darwin"
 then
-  VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa])
-  VLC_ADD_OBJCFLAGS([minimal_macosx], [-fobjc-exceptions] )
   VLC_ADD_PLUGIN([minimal_macosx])
 fi
-AM_CONDITIONAL(ENABLE_MINIMAL_MACOSX, [test "$enable_minimal_macosx" != "no"])
 
 dnl
 dnl  MacOS X dialog provider
@@ -4155,7 +4152,6 @@ AC_CONFIG_FILES([
   test/Makefile
   modules/gui/ios_dialog_provider/Makefile
   modules/gui/macosx/Makefile
-  modules/gui/minimal_macosx/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 fac4dfe..46dad91 100644
--- a/modules/gui/Makefile.am
+++ b/modules/gui/Makefile.am
@@ -1,7 +1,7 @@
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
+DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
 
 if ENABLE_MACOSX_UI
 SUBDIRS += gui/macosx
@@ -9,9 +9,6 @@ endif
 if HAVE_IOS
 SUBDIRS += gui/ios_dialog_provider
 endif
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
 if ENABLE_QT4
 SUBDIRS += gui/qt4
 endif
@@ -38,3 +35,14 @@ libmacosx_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -
 
 EXTRA_LTLIBRARIES += libmacosx_dialog_provider_plugin.la
 gui_LTLIBRARIES += $(LTLIBmacosx_dialog_provider)
+
+
+libminimal_macosx_plugin_la_SOURCES = \
+	gui/minimal_macosx/intf.h gui/minimal_macosx/intf.m \
+	gui/minimal_macosx/misc.h gui/minimal_macosx/misc.m \
+	gui/minimal_macosx/VLCMinimalVoutWindow.h gui/minimal_macosx/VLCMinimalVoutWindow.m \
+	gui/minimal_macosx/macosx.c
+libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions
+libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-framework,Cocoa
+EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la
+gui_LTLIBRARIES += $(LTLIBminimal_macosx)
diff --git a/modules/gui/minimal_macosx/.gitignore b/modules/gui/minimal_macosx/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/gui/minimal_macosx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/minimal_macosx/Modules.am b/modules/gui/minimal_macosx/Modules.am
deleted file mode 100644
index 4c50775..0000000
--- a/modules/gui/minimal_macosx/Modules.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_LIBTOOLFLAGS=--tag=CC
-
-SOURCES_minimal_macosx = \
-	misc.m \
-	intf.m \
-	macosx.c \
-	VLCMinimalVoutWindow.m \
-	$(NULL)
-
-noinst_HEADERS = \
-	intf.h \
-	misc.h \
-	VLCMinimalVoutWindow.h