[vlc-commits] gui: fix .gitignore cat error

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb 12 19:14:29 2015 +0200| [3ceee481b59eb64b78e9ab9e17e5ad0d5179cc50] | committer: Rémi Denis-Courmont

gui: fix .gitignore cat error

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

 modules/gui/ios_dialog_provider/.gitignore    |   33 +------------------------
 modules/gui/macosx/.gitignore                 |   33 +------------------------
 modules/gui/macosx_dialog_provider/.gitignore |   33 +------------------------
 modules/gui/minimal_macosx/.gitignore         |   33 +------------------------
 modules/gui/skins2/.gitignore                 |   33 +------------------------
 5 files changed, 5 insertions(+), 160 deletions(-)

diff --git a/modules/gui/ios_dialog_provider/.gitignore b/modules/gui/ios_dialog_provider/.gitignore
index 6ccc850..08a6d72 100644
--- a/modules/gui/ios_dialog_provider/.gitignore
+++ b/modules/gui/ios_dialog_provider/.gitignore
@@ -1,32 +1 @@
-guidir = $(pluginsdir)/gui
-gui_LTLIBRARIES =
-
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider 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
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += gui/qt4
-endif
-if BUILD_SKINS
-SUBDIRS += gui/skins2
-endif
-
-libncurses_plugin_la_SOURCES = gui/ncurses.c
-libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
-libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
-if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
-endif
-
-EXTRA_DIST += gui/eject.c
+Makefile.am
diff --git a/modules/gui/macosx/.gitignore b/modules/gui/macosx/.gitignore
index 6ccc850..08a6d72 100644
--- a/modules/gui/macosx/.gitignore
+++ b/modules/gui/macosx/.gitignore
@@ -1,32 +1 @@
-guidir = $(pluginsdir)/gui
-gui_LTLIBRARIES =
-
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider 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
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += gui/qt4
-endif
-if BUILD_SKINS
-SUBDIRS += gui/skins2
-endif
-
-libncurses_plugin_la_SOURCES = gui/ncurses.c
-libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
-libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
-if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
-endif
-
-EXTRA_DIST += gui/eject.c
+Makefile.am
diff --git a/modules/gui/macosx_dialog_provider/.gitignore b/modules/gui/macosx_dialog_provider/.gitignore
index 6ccc850..08a6d72 100644
--- a/modules/gui/macosx_dialog_provider/.gitignore
+++ b/modules/gui/macosx_dialog_provider/.gitignore
@@ -1,32 +1 @@
-guidir = $(pluginsdir)/gui
-gui_LTLIBRARIES =
-
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider 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
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += gui/qt4
-endif
-if BUILD_SKINS
-SUBDIRS += gui/skins2
-endif
-
-libncurses_plugin_la_SOURCES = gui/ncurses.c
-libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
-libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
-if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
-endif
-
-EXTRA_DIST += gui/eject.c
+Makefile.am
diff --git a/modules/gui/minimal_macosx/.gitignore b/modules/gui/minimal_macosx/.gitignore
index 6ccc850..08a6d72 100644
--- a/modules/gui/minimal_macosx/.gitignore
+++ b/modules/gui/minimal_macosx/.gitignore
@@ -1,32 +1 @@
-guidir = $(pluginsdir)/gui
-gui_LTLIBRARIES =
-
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider 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
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += gui/qt4
-endif
-if BUILD_SKINS
-SUBDIRS += gui/skins2
-endif
-
-libncurses_plugin_la_SOURCES = gui/ncurses.c
-libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
-libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
-if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
-endif
-
-EXTRA_DIST += gui/eject.c
+Makefile.am
diff --git a/modules/gui/skins2/.gitignore b/modules/gui/skins2/.gitignore
index 6ccc850..08a6d72 100644
--- a/modules/gui/skins2/.gitignore
+++ b/modules/gui/skins2/.gitignore
@@ -1,32 +1 @@
-guidir = $(pluginsdir)/gui
-gui_LTLIBRARIES =
-
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider 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
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += gui/qt4
-endif
-if BUILD_SKINS
-SUBDIRS += gui/skins2
-endif
-
-libncurses_plugin_la_SOURCES = gui/ncurses.c
-libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
-libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
-if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
-endif
-
-EXTRA_DIST += gui/eject.c
+Makefile.am