ios_dialog_provider: Remove Modules.am
authorDavid Fuhrmann <dfuhrmann@videolan.org>
Wed, 24 Jun 2015 18:23:50 +0000 (20:23 +0200)
committerDavid Fuhrmann <dfuhrmann@videolan.org>
Wed, 24 Jun 2015 20:52:44 +0000 (22:52 +0200)
configure.ac
modules/gui/Makefile.am
modules/gui/ios_dialog_provider/.gitignore [deleted file]
modules/gui/ios_dialog_provider/Modules.am [deleted file]

index ba8aa2a..e7fc001 100644 (file)
@@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([
   lib/Makefile
   bin/Makefile
   test/Makefile
-  modules/gui/ios_dialog_provider/Makefile
   modules/gui/macosx/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
index 46dad91..47bd638 100644 (file)
@@ -1,14 +1,11 @@
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 
-DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
+DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2
 
 if ENABLE_MACOSX_UI
 SUBDIRS += gui/macosx
 endif
-if HAVE_IOS
-SUBDIRS += gui/ios_dialog_provider
-endif
 if ENABLE_QT4
 SUBDIRS += gui/qt4
 endif
@@ -46,3 +43,11 @@ 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)
+
+
+libios_dialog_provider_plugin_la_SOURCES = gui/ios_dialog_provider/dialogProvider.m
+libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
+libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit
+if HAVE_IOS
+gui_LTLIBRARIES += libios_dialog_provider_plugin.la
+endif
diff --git a/modules/gui/ios_dialog_provider/.gitignore b/modules/gui/ios_dialog_provider/.gitignore
deleted file mode 100644 (file)
index 08a6d72..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/ios_dialog_provider/Modules.am b/modules/gui/ios_dialog_provider/Modules.am
deleted file mode 100644 (file)
index 48796dd..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_LIBTOOLFLAGS=--tag=CC
-
-libios_dialog_provider_plugin_la_SOURCES = dialogProvider.m
-libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
-libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit
-
-if HAVE_IOS
-gui_LTLIBRARIES += libios_dialog_provider_plugin.la
-endif